diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index 33fb3842bde..0d806788557 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -36,7 +36,6 @@
 #include "winerror.h"
 #include "ntstatus.h"
 #include "wine/unicode.h"
-#include "heap.h"
 #include "wine/server.h"
 #include "wine/debug.h"
 #include "winternl.h"
diff --git a/dlls/commdlg/fontdlg16.c b/dlls/commdlg/fontdlg16.c
index 9e68607f672..61dd598efa7 100644
--- a/dlls/commdlg/fontdlg16.c
+++ b/dlls/commdlg/fontdlg16.c
@@ -31,7 +31,6 @@
 #include "winnls.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
-#include "heap.h"
 #include "commdlg.h"
 #include "dlgs.h"
 #include "wine/debug.h"
diff --git a/dlls/gdi/printdrv.c b/dlls/gdi/printdrv.c
index fdd054e9033..b84d0ed3dde 100644
--- a/dlls/gdi/printdrv.c
+++ b/dlls/gdi/printdrv.c
@@ -50,7 +50,6 @@
 #include "wine/debug.h"
 #include "gdi.h"
 #include "heap.h"
-#include "file.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(print);
 
diff --git a/dlls/kernel/dosmem.c b/dlls/kernel/dosmem.c
index d863fbcfca2..db89db94217 100644
--- a/dlls/kernel/dosmem.c
+++ b/dlls/kernel/dosmem.c
@@ -41,7 +41,6 @@
 #include "wine/winbase16.h"
 
 #include "global.h"
-#include "selectors.h"
 #include "miscemu.h"
 #include "wine/debug.h"
 
diff --git a/dlls/kernel/profile.c b/dlls/kernel/profile.c
index 9641c598954..745d2009c22 100644
--- a/dlls/kernel/profile.c
+++ b/dlls/kernel/profile.c
@@ -42,7 +42,6 @@
 #include "winternl.h"
 #include "wine/winbase16.h"
 #include "file.h"
-#include "heap.h"
 #include "wine/unicode.h"
 #include "wine/server.h"
 #include "wine/library.h"
diff --git a/dlls/kernel/relay16.c b/dlls/kernel/relay16.c
index e739115e686..12485a7734d 100644
--- a/dlls/kernel/relay16.c
+++ b/dlls/kernel/relay16.c
@@ -31,7 +31,6 @@
 #include "wine/winbase16.h"
 #include "module.h"
 #include "stackframe.h"
-#include "selectors.h"
 #include "builtin16.h"
 #include "kernel_private.h"
 #include "wine/unicode.h"
diff --git a/dlls/kernel/task.c b/dlls/kernel/task.c
index 74f8f7f8727..c373aebf090 100644
--- a/dlls/kernel/task.c
+++ b/dlls/kernel/task.c
@@ -42,7 +42,6 @@
 #include "global.h"
 #include "module.h"
 #include "winternl.h"
-#include "selectors.h"
 #include "wine/server.h"
 #include "stackframe.h"
 #include "task.h"
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index 59b475527a8..010274c8adb 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -29,7 +29,6 @@
 #include "winternl.h"
 
 #include "module.h"
-#include "file.h"
 #include "wine/exception.h"
 #include "excpt.h"
 #include "wine/unicode.h"
diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c
index 7f7278135e3..155ac278827 100644
--- a/dlls/ntdll/loadorder.c
+++ b/dlls/ntdll/loadorder.c
@@ -33,6 +33,7 @@
 #include "winreg.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
+#include "module.h"
 
 #include "wine/debug.h"
 #include "wine/unicode.h"
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 4622001f5ef..fb33cc0a382 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -27,7 +27,6 @@
 #include "winreg.h"
 #include "ntstatus.h"
 #include "winternl.h"
-#include "module.h"
 #include "thread.h"
 #include "wine/server.h"
 
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index af4cc47ac16..bfb2a1f562f 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -35,15 +35,14 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wine/exception.h"
-#include "file.h"
 #include "winnls.h"
-#include "wine/debug.h"
 #include "winerror.h"
-
 #include "winreg.h"
 #include "winternl.h"
 #include "ntdll_misc.h"
 #include "excpt.h"
+#include "wine/library.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
 
diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c
index 9760840a3c3..380612856de 100644
--- a/dlls/ntdll/signal_powerpc.c
+++ b/dlls/ntdll/signal_powerpc.c
@@ -56,10 +56,8 @@
 #include "winternl.h"
 #include "wine/library.h"
 #include "wine/exception.h"
-#include "selectors.h"
 #include "global.h"
 #include "ntdll_misc.h"
-#include "miscemu.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(seh);
diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index c89d26fcb26..b53a3819309 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -36,7 +36,6 @@
 #include "winreg.h"
 #include "winternl.h"
 #include "winerror.h"
-#include "module.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
 #include "ntdll_misc.h"
diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c
index d24bab6032b..d665425fdb2 100644
--- a/dlls/shell32/shelllink.c
+++ b/dlls/shell32/shelllink.c
@@ -50,7 +50,6 @@
 #include "shlobj.h"
 #include "undocshell.h"
 
-#include "heap.h"
 #include "pidl.h"
 #include "shell32_main.h"
 #include "shlguid.h"
diff --git a/dlls/winedos/dosconf.c b/dlls/winedos/dosconf.c
index aa27432af99..9d7ca97cf19 100644
--- a/dlls/winedos/dosconf.c
+++ b/dlls/winedos/dosconf.c
@@ -34,7 +34,6 @@
 #include "winbase.h"
 #include "winreg.h"
 
-#include "file.h"
 #include "dosexe.h"
 
 #include "wine/debug.h"
diff --git a/dlls/winedos/himem.c b/dlls/winedos/himem.c
index 28ba78705a0..748f7542561 100644
--- a/dlls/winedos/himem.c
+++ b/dlls/winedos/himem.c
@@ -19,6 +19,7 @@
  */
 
 #include "dosexe.h"
+#include "selectors.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dosmem);
diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c
index b55db3947ee..7d91bf79891 100644
--- a/dlls/winedos/module.c
+++ b/dlls/winedos/module.c
@@ -44,8 +44,6 @@
 #include "winuser.h"
 #include "winerror.h"
 #include "task.h"
-#include "file.h"
-#include "miscemu.h"
 #include "wine/debug.h"
 #include "dosexe.h"
 #include "dosvm.h"
diff --git a/dlls/winedos/vxd.c b/dlls/winedos/vxd.c
index af0fabecc7d..614517a440b 100644
--- a/dlls/winedos/vxd.c
+++ b/dlls/winedos/vxd.c
@@ -42,7 +42,6 @@
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "dosexe.h"
-#include "selectors.h"
 #include "task.h"
 #include "wine/debug.h"
 
diff --git a/include/miscemu.h b/include/miscemu.h
index b2a3666ae3d..59dae8a4c51 100644
--- a/include/miscemu.h
+++ b/include/miscemu.h
@@ -22,7 +22,7 @@
 #define __WINE_MISCEMU_H
 
 #include <windef.h>
-#include <selectors.h>
+#include <wine/library.h>
 #include <wine/windef16.h>
 
 /* msdos/dosmem.c */
diff --git a/misc/options.c b/misc/options.c
index b799914f9c6..d6883eac784 100644
--- a/misc/options.c
+++ b/misc/options.c
@@ -30,7 +30,6 @@
 #include "winternl.h"
 #include "wine/library.h"
 #include "options.h"
-#include "module.h"
 #include "wine/debug.h"
 
 struct option_descr
diff --git a/objects/bitmap.c b/objects/bitmap.c
index aa706186352..eaabfad883a 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -25,7 +25,6 @@
 #include "wine/winbase16.h"
 #include "gdi.h"
 #include "bitmap.h"
-#include "selectors.h"
 #include "wine/debug.h"
 #include "wine/winuser16.h"
 
diff --git a/objects/dc.c b/objects/dc.c
index 18668459c48..33c840035a2 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -32,7 +32,6 @@
 #include "wownt32.h"
 #include "wine/winuser16.h"
 #include "gdi.h"
-#include "heap.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
 
diff --git a/objects/dib.c b/objects/dib.c
index 604eb54e3c1..8c647136a4d 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -25,7 +25,6 @@
 #include "windef.h"
 #include "winbase.h"
 #include "bitmap.h"
-#include "selectors.h"
 #include "gdi.h"
 #include "wownt32.h"
 #include "wine/debug.h"
diff --git a/windows/user.c b/windows/user.c
index f971f96b09b..80bc11aa2e2 100644
--- a/windows/user.c
+++ b/windows/user.c
@@ -28,14 +28,14 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/winuser16.h"
+#include "winreg.h"
+#include "winternl.h"
 #include "user.h"
 #include "win.h"
 #include "controls.h"
 #include "cursoricon.h"
 #include "message.h"
 #include "local.h"
-#include "module.h"
-#include "winternl.h"
 #include "wine/debug.h"
 
 WINE_DECLARE_DEBUG_CHANNEL(hook);