diff --git a/if1632/builtin.c b/if1632/builtin.c
index 2f1c64b324da6de47afe005df233d5f5660e8434..d01ed8e026993a48f3e1fad25516f64da6118aec 100644
--- a/if1632/builtin.c
+++ b/if1632/builtin.c
@@ -18,7 +18,6 @@
 #include "module.h"
 #include "miscemu.h"
 #include "stackframe.h"
-#include "user.h"
 #include "process.h"
 #include "task.h"
 #include "debugtools.h"
diff --git a/if1632/thunk.c b/if1632/thunk.c
index 57c1928f713eba0d54ab788458b41f8ddfa9a3ba..11adc2ee73a00f644c0eacdc91d1d8368328e3ea 100644
--- a/if1632/thunk.c
+++ b/if1632/thunk.c
@@ -11,14 +11,12 @@
 #include "hook.h"
 #include "callback.h"
 #include "builtin16.h"
-#include "user.h"
 #include "heap.h"
 #include "neexe.h"
 #include "process.h"
 #include "stackframe.h"
 #include "win.h"
 #include "flatthunk.h"
-#include "mouse.h"
 #include "selectors.h"
 #include "keyboard.h"
 #include "debugtools.h"
diff --git a/loader/task.c b/loader/task.c
index 7ba3c2011d0222ab5e19a05858d3245e1c0622b0..0ac967bba05c875539192fd5cc980ef9d9ed7842 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -10,7 +10,6 @@
 #include <unistd.h>
 
 #include "wine/winbase16.h"
-#include "user.h"
 #include "callback.h"
 #include "drive.h"
 #include "file.h"
diff --git a/memory/atom.c b/memory/atom.c
index 5ff65442bc0e4339731f760b46178b6f0a9d4568..fadbe6111e8f9a5ba3779ff3d7b181dd88e87e22 100644
--- a/memory/atom.c
+++ b/memory/atom.c
@@ -25,7 +25,6 @@
 #include "instance.h"
 #include "ldt.h"
 #include "stackframe.h"
-#include "user.h"
 #include "debugtools.h"
 #include "server.h"
 
diff --git a/scheduler/thread.c b/scheduler/thread.c
index 40cf44c833886628906bdfaf660d0c7cc70f9d3d..839e4663291ed32b419fc15d96a110c48ff51a02 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -19,7 +19,6 @@
 #include "task.h"
 #include "module.h"
 #include "global.h"
-#include "user.h"
 #include "winerror.h"
 #include "heap.h"
 #include "selectors.h"
diff --git a/win32/kernel32.c b/win32/kernel32.c
index 025357e7b4071240f52fbb46d125289d706ab2b6..f962e7337300f19e32cacbf7b0aa2fc8b3e714ef 100644
--- a/win32/kernel32.c
+++ b/win32/kernel32.c
@@ -15,7 +15,6 @@
 #include "wine/winbase16.h"
 #include "callback.h"
 #include "task.h"
-#include "user.h"
 #include "heap.h"
 #include "module.h"
 #include "neexe.h"