diff --git a/dlls/kernel/atom.c b/dlls/kernel/atom.c
index 7dd1b66b6d0..510eb61d691 100644
--- a/dlls/kernel/atom.c
+++ b/dlls/kernel/atom.c
@@ -35,7 +35,6 @@
 
 #include "wine/exception.h"
 #include "excpt.h"
-#include "wine/server.h"
 #include "wine/unicode.h"
 #include "kernel_private.h"
 
diff --git a/dlls/kernel/atom16.c b/dlls/kernel/atom16.c
index 698ad1474aa..9ea65b98bff 100644
--- a/dlls/kernel/atom16.c
+++ b/dlls/kernel/atom16.c
@@ -37,8 +37,8 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
+#include "winternl.h"
 
-#include "wine/server.h"
 #include "wine/unicode.h"
 #include "wine/winbase16.h"
 #include "kernel_private.h"
diff --git a/dlls/kernel/environ.c b/dlls/kernel/environ.c
index 2d8f2676fa8..ecae8fe346d 100644
--- a/dlls/kernel/environ.c
+++ b/dlls/kernel/environ.c
@@ -31,7 +31,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
-#include "wine/server.h"
 #include "wine/library.h"
 #include "winternl.h"
 #include "wine/unicode.h"
diff --git a/dlls/kernel/file16.c b/dlls/kernel/file16.c
index 6353cd8cdae..0ac6fad2e6b 100644
--- a/dlls/kernel/file16.c
+++ b/dlls/kernel/file16.c
@@ -37,7 +37,6 @@
 #include "winbase.h"
 #include "winternl.h"
 #include "wine/winbase16.h"
-#include "wine/server.h"
 #include "kernel_private.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
diff --git a/dlls/kernel/module.c b/dlls/kernel/module.c
index 4610adfcd1c..432cd693cf6 100644
--- a/dlls/kernel/module.c
+++ b/dlls/kernel/module.c
@@ -43,7 +43,6 @@
 #include "wine/exception.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"
-#include "wine/server.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(module);
 
diff --git a/dlls/kernel/oldconfig.c b/dlls/kernel/oldconfig.c
index 47e249fae05..6114ee41a12 100644
--- a/dlls/kernel/oldconfig.c
+++ b/dlls/kernel/oldconfig.c
@@ -49,7 +49,6 @@
 #include "winioctl.h"
 #include "ntddscsi.h"
 #include "wine/library.h"
-#include "wine/server.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
 #include "kernel_private.h"
diff --git a/dlls/kernel/profile.c b/dlls/kernel/profile.c
index b704dd0b31b..523357d4747 100644
--- a/dlls/kernel/profile.c
+++ b/dlls/kernel/profile.c
@@ -32,7 +32,6 @@
 #include "winternl.h"
 #include "wine/winbase16.h"
 #include "wine/unicode.h"
-#include "wine/server.h"
 #include "wine/library.h"
 #include "wine/debug.h"
 
diff --git a/dlls/kernel/task.c b/dlls/kernel/task.c
index 678e37226b9..7265b732ed6 100644
--- a/dlls/kernel/task.c
+++ b/dlls/kernel/task.c
@@ -39,7 +39,6 @@
 #include "wine/winbase16.h"
 #include "thread.h"
 #include "winternl.h"
-#include "wine/server.h"
 #include "toolhelp.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"
diff --git a/dlls/kernel/toolhelp16.c b/dlls/kernel/toolhelp16.c
index 23b206a8e55..58c1cf6884e 100644
--- a/dlls/kernel/toolhelp16.c
+++ b/dlls/kernel/toolhelp16.c
@@ -30,10 +30,11 @@
 #include <assert.h>
 #include "windef.h"
 #include "winbase.h"
-#include "wine/winbase16.h"
+#include "winternl.h"
 #include "winerror.h"
+
+#include "wine/winbase16.h"
 #include "toolhelp.h"
-#include "wine/server.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(toolhelp);