diff --git a/dlls/kernel/utthunk.c b/dlls/kernel/utthunk.c
index e3e09c4fd22..136fa4b8881 100644
--- a/dlls/kernel/utthunk.c
+++ b/dlls/kernel/utthunk.c
@@ -7,7 +7,6 @@
 #include "wine/winbase16.h"
 #include "ntddk.h"
 #include "module.h"
-#include "callback.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(thunk);
diff --git a/dlls/kernel/wowthunk.c b/dlls/kernel/wowthunk.c
index bbb3c636a45..ca3a48baf9a 100644
--- a/dlls/kernel/wowthunk.c
+++ b/dlls/kernel/wowthunk.c
@@ -10,7 +10,6 @@
 #include "file.h"
 #include "miscemu.h"
 #include "stackframe.h"
-#include "builtin16.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(thunk);
diff --git a/dlls/setupapi/virtcopy.c b/dlls/setupapi/virtcopy.c
index eef036abaa8..2501315fcdb 100644
--- a/dlls/setupapi/virtcopy.c
+++ b/dlls/setupapi/virtcopy.c
@@ -6,12 +6,12 @@
  */
 
 #include <string.h>
-#include "debugtools.h"
-#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
 #include "setupx16.h"
-#include "callback.h"
 #include "winreg.h"
 #include "setupapi_private.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(setupapi);
 
diff --git a/dlls/winedos/dosaspi.c b/dlls/winedos/dosaspi.c
index 140e8cae12b..7e414669a48 100644
--- a/dlls/winedos/dosaspi.c
+++ b/dlls/winedos/dosaspi.c
@@ -6,7 +6,6 @@
 #include "wine/winaspi.h"
 #include "debugtools.h"
 #include "miscemu.h" /* DOSMEM_* */
-#include "callback.h"
 #include "winerror.h"
 
 DEFAULT_DEBUG_CHANNEL(aspi);
diff --git a/graphics/win16drv/prtdrv.c b/graphics/win16drv/prtdrv.c
index 31ebebb1507..d664bd85ca4 100644
--- a/graphics/win16drv/prtdrv.c
+++ b/graphics/win16drv/prtdrv.c
@@ -11,9 +11,9 @@
 #include <unistd.h>
 #include <errno.h>
 #include "wine/winbase16.h"
+#include "winuser.h"
 #include "win16drv.h"
 #include "heap.h"
-#include "callback.h"
 #include "debugtools.h"
 #include "bitmap.h"
 
diff --git a/if1632/relay.c b/if1632/relay.c
index 597dc1db827..59eaf5cec27 100644
--- a/if1632/relay.c
+++ b/if1632/relay.c
@@ -16,7 +16,6 @@
 #include "builtin16.h"
 #include "syslevel.h"
 #include "debugtools.h"
-#include "callback.h"
 
 DEFAULT_DEBUG_CHANNEL(relay);
 
diff --git a/loader/ne/resource.c b/loader/ne/resource.c
index ac3bf82f601..e636af75fc3 100644
--- a/loader/ne/resource.c
+++ b/loader/ne/resource.c
@@ -20,7 +20,6 @@
 #include "wine/winbase16.h"
 #include "wine/library.h"
 #include "module.h"
-#include "callback.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(resource);
diff --git a/memory/local.c b/memory/local.c
index 5eea9822735..0ffee00da73 100644
--- a/memory/local.c
+++ b/memory/local.c
@@ -23,7 +23,6 @@
 #include "stackframe.h"
 #include "toolhelp.h"
 #include "debugtools.h"
-#include "callback.h"
 
 DEFAULT_DEBUG_CHANNEL(local);
 DECLARE_DEBUG_CHANNEL(heap);
diff --git a/msdos/dpmi.c b/msdos/dpmi.c
index d8687d5f661..13d18b9e79f 100644
--- a/msdos/dpmi.c
+++ b/msdos/dpmi.c
@@ -12,7 +12,6 @@
 
 #include "windef.h"
 #include "wine/winbase16.h"
-#include "builtin16.h"
 #include "miscemu.h"
 #include "msdos.h"
 #include "task.h"
diff --git a/objects/dib.c b/objects/dib.c
index 04f0c9e6012..f14cd05c557 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -10,7 +10,6 @@
 
 #include "winbase.h"
 #include "bitmap.h"
-#include "callback.h"
 #include "selectors.h"
 #include "gdi.h"
 #include "debugtools.h"
diff --git a/scheduler/thread.c b/scheduler/thread.c
index 860df592a67..c6c269579ec 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -24,7 +24,6 @@
 #include "wine/server.h"
 #include "services.h"
 #include "stackframe.h"
-#include "builtin16.h"
 #include "debugtools.h"
 #include "winnls.h"
 
diff --git a/windows/user.c b/windows/user.c
index 93802336326..32441f5ff48 100644
--- a/windows/user.c
+++ b/windows/user.c
@@ -11,6 +11,7 @@
 #include "windef.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "wine/winuser16.h"
 #include "heap.h"
 #include "user.h"
 #include "win.h"
@@ -20,7 +21,6 @@
 #include "message.h"
 #include "miscemu.h"
 #include "sysmetrics.h"
-#include "callback.h"
 #include "local.h"
 #include "module.h"
 #include "debugtools.h"