diff --git a/dlls/gdi/bitmap.c b/dlls/gdi/bitmap.c
index 56424a5..575637e 100644
--- a/dlls/gdi/bitmap.c
+++ b/dlls/gdi/bitmap.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include "wine/winbase16.h"
-#include "wine/winuser16.h"
+#include "wine/wingdi16.h"
 #include "gdi.h"
 #include "gdi_private.h"
 #include "wine/debug.h"
diff --git a/dlls/gdi/icm.c b/dlls/gdi/icm.c
index 8a87a04..39b0ff2 100644
--- a/dlls/gdi/icm.c
+++ b/dlls/gdi/icm.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
 #include "wingdi.h"
 
 #include "wine/debug.h"
diff --git a/dlls/gdi/wing.c b/dlls/gdi/wing.c
index ffd4843..7124424 100644
--- a/dlls/gdi/wing.c
+++ b/dlls/gdi/wing.c
@@ -23,7 +23,7 @@
 #include "windef.h"
 #include "wownt32.h"
 #include "gdi.h"
-#include "wine/winuser16.h"
+#include "wine/wingdi16.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(wing);
diff --git a/dlls/oleaut32/ole2disp.c b/dlls/oleaut32/ole2disp.c
index 7d9cf57..1d81049 100644
--- a/dlls/oleaut32/ole2disp.c
+++ b/dlls/oleaut32/ole2disp.c
@@ -33,7 +33,6 @@
 #include "winerror.h"
 
 #include "ole2disp.h"
-#include "olectl.h"
 
 #include "wine/debug.h"
 
diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c
index 026390f..02b2527 100644
--- a/dlls/oleaut32/tmarshal.c
+++ b/dlls/oleaut32/tmarshal.c
@@ -42,11 +42,8 @@
 #include "winuser.h"
 
 #include "ole2.h"
-#include "wine/unicode.h"
-#include "ole2disp.h"
 #include "typelib.h"
 #include "wine/debug.h"
-#include "winternl.h"
 
 static const WCHAR riidW[5] = {'r','i','i','d',0};
 static const WCHAR pdispparamsW[] = {'p','d','i','s','p','p','a','r','a','m','s',0};
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 9de4037..003425c 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -74,7 +74,6 @@
 
 #include "wine/unicode.h"
 #include "objbase.h"
-#include "ole2disp.h"
 #include "typelib.h"
 #include "wine/debug.h"
 #include "variant.h"
diff --git a/dlls/oleaut32/typelib16.c b/dlls/oleaut32/typelib16.c
index 3f79153..01abb2d 100644
--- a/dlls/oleaut32/typelib16.c
+++ b/dlls/oleaut32/typelib16.c
@@ -39,7 +39,6 @@
 
 #include "objbase.h"
 #include "ole2disp.h"
-#include "typelib.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c
index a6a7d06..c83eb16 100644
--- a/dlls/oleaut32/typelib2.c
+++ b/dlls/oleaut32/typelib2.c
@@ -48,10 +48,8 @@
 
 #include "wine/unicode.h"
 #include "objbase.h"
-#include "ole2disp.h"
 #include "typelib.h"
 #include "wine/debug.h"
-#include "variant.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(typelib2);
 /* WINE_DEFAULT_DEBUG_CHANNEL(ole); */
diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c
index b2588ab..9cbded9 100644
--- a/dlls/shell32/changenotify.c
+++ b/dlls/shell32/changenotify.c
@@ -27,9 +27,7 @@
 #include "winbase.h"
 #include "wine/debug.h"
 #include "wingdi.h"
-#include "pidl.h"
 #include "shell32_main.h"
-#include "undocshell.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c
index 9a70dbd..588aae7 100644
--- a/dlls/shell32/cpanelfolder.c
+++ b/dlls/shell32/cpanelfolder.c
@@ -47,7 +47,6 @@
 #include "shell32_main.h"
 #include "shresdef.h"
 #include "shlwapi.h"
-#include "shellfolder.h"
 #include "wine/debug.h"
 #include "debughlp.h"
 #include "shfldr.h"
diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c
index 4c9fcc4..31abedb 100644
--- a/dlls/shell32/enumidlist.c
+++ b/dlls/shell32/enumidlist.c
@@ -28,13 +28,9 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
-#include "undocshell.h"
 #include "shlwapi.h"
-#include "winerror.h"
-#include "objbase.h"
 
 #include "pidl.h"
-#include "shlguid.h"
 #include "enumidlist.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c
index 2f993d7..7aa2e74 100644
--- a/dlls/shell32/folders.c
+++ b/dlls/shell32/folders.c
@@ -34,10 +34,8 @@
 #include "undocshell.h"
 #include "shlguid.h"
 #include "winreg.h"
-#include "shlwapi.h"
 
 #include "wine/debug.h"
-#include "wine/unicode.h"
 
 #include "pidl.h"
 #include "shell32_main.h"
diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c
index e5d1a23..d13300d 100644
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -43,7 +43,6 @@
 #include "pidl.h"
 #include "shell32_main.h"
 #include "undocshell.h"
-#include "shlwapi.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index e6c77e1..ff9ffb9 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -47,7 +47,6 @@
 #include "shlwapi.h"
 
 #include "pidl.h"
-#include "debughlp.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(pidl);
diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c
index 51e9fa5..700ab51 100644
--- a/dlls/shell32/shellreg.c
+++ b/dlls/shell32/shellreg.c
@@ -36,7 +36,6 @@
 
 #include "undocshell.h"
 #include "wine/winbase16.h"
-#include "shell32_main.h"
 
 #include "wine/debug.h"
 
diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c
index 74f3f57..5de8574 100644
--- a/dlls/shell32/shfldr_mycomp.c
+++ b/dlls/shell32/shfldr_mycomp.c
@@ -45,7 +45,6 @@
 #include "shell32_main.h"
 #include "shresdef.h"
 #include "shlwapi.h"
-#include "shellfolder.h"
 #include "wine/debug.h"
 #include "debughlp.h"
 #include "shfldr.h"
diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index e55ec2c..22da0fa 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -38,17 +38,12 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "winreg.h"
-#include "wownt32.h"
-#include "shellapi.h"
-#include "wingdi.h"
 #include "winuser.h"
-#include "shlobj.h"
 #include "shlwapi.h"
 #include "ddeml.h"
 
 #include "wine/winbase16.h"
 #include "shell32_main.h"
-#include "undocshell.h"
 #include "pidl.h"
 
 #include "wine/debug.h"
diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c
index 7b525a2..1f58419 100644
--- a/dlls/shell32/shlfolder.c
+++ b/dlls/shell32/shlfolder.c
@@ -45,11 +45,8 @@
 #include "pidl.h"
 #include "undocshell.h"
 #include "shell32_main.h"
-#include "shresdef.h"
 #include "shlwapi.h"
-#include "shellfolder.h"
 #include "wine/debug.h"
-#include "debughlp.h"
 #include "shfldr.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL (shell);
diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c
index ef425d6..14e1f3a 100644
--- a/dlls/shell32/shlfsbind.c
+++ b/dlls/shell32/shlfsbind.c
@@ -33,7 +33,6 @@
 #include "shlobj.h"
 #include "shell32_main.h"
 
-#include "debughlp.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(pidl);