diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c
index b489b7cac35..0a934bca73a 100644
--- a/dlls/advapi32/advapi.c
+++ b/dlls/advapi32/advapi.c
@@ -4,6 +4,7 @@
  * Copyright 1995 Sven Verdoolaege
  */
 
+#include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 
diff --git a/dlls/commdlg/filetitle.c b/dlls/commdlg/filetitle.c
index 4f93534b1b3..1838319b73e 100644
--- a/dlls/commdlg/filetitle.c
+++ b/dlls/commdlg/filetitle.c
@@ -7,6 +7,7 @@
 
 #include <string.h>
 
+#include "wine/winestring.h"
 #include "winbase.h"
 #include "commdlg.h"
 #include "debug.h"
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index dd362af6dc8..4fa4d1034a5 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -7,6 +7,7 @@
  * Copyright 1996-1998 Marcus Meissner
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index ba74b39c5ce..9d2a352b563 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -2,6 +2,7 @@
  *	Process synchronisation
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
diff --git a/if1632/builtin.c b/if1632/builtin.c
index a986ff6c5b2..421fbca746d 100644
--- a/if1632/builtin.c
+++ b/if1632/builtin.c
@@ -22,6 +22,7 @@
 #include "snoop.h"
 #include "task.h"
 #include "debug.h"
+#include "toolhelp.h"
 
 DEFAULT_DEBUG_CHANNEL(module)
 
diff --git a/loader/ne/module.c b/loader/ne/module.c
index a329e60ba71..677e19cb3eb 100644
--- a/loader/ne/module.c
+++ b/loader/ne/module.c
@@ -30,6 +30,7 @@
 #include "file.h"
 #include "loadorder.h"
 #include "elfdll.h"
+#include "toolhelp.h"
 
 DEFAULT_DEBUG_CHANNEL(module)
 
diff --git a/loader/ne/segment.c b/loader/ne/segment.c
index 6ff87d9da60..31c9fcb423e 100644
--- a/loader/ne/segment.c
+++ b/loader/ne/segment.c
@@ -27,6 +27,7 @@
 #include "stackframe.h"
 #include "debugtools.h"
 #include "xmalloc.h"
+#include "toolhelp.h"
 
 DECLARE_DEBUG_CHANNEL(dll)
 DECLARE_DEBUG_CHANNEL(fixup)
diff --git a/memory/atom.c b/memory/atom.c
index a4e19aaa11d..c317449de16 100644
--- a/memory/atom.c
+++ b/memory/atom.c
@@ -16,6 +16,8 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "wine/winbase16.h"
+#include "wine/winuser16.h"
 #include "winuser.h"
 #include "instance.h"
 #include "ldt.h"
diff --git a/memory/string.c b/memory/string.c
index c3389419911..4e480d900d8 100644
--- a/memory/string.c
+++ b/memory/string.c
@@ -7,6 +7,8 @@
 
 #include <ctype.h>
 #include <string.h>
+
+#include "wine/winbase16.h"
 #include "winbase.h"
 #include "winuser.h"
 #include "wine/keyboard16.h"
diff --git a/objects/text.c b/objects/text.c
index 37b6b9f2552..bf6bf2a8cd1 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -6,6 +6,8 @@
  */
 
 #include <string.h>
+
+#include "wine/winuser16.h"
 #include "winbase.h"
 #include "winuser.h"
 #include "dc.h"
diff --git a/win32/thread.c b/win32/thread.c
index c0b489ddbcd..13675972535 100644
--- a/win32/thread.c
+++ b/win32/thread.c
@@ -5,8 +5,10 @@
  * Copyright 1997 Onno Hovers
  */
 
-#include <unistd.h>
 #include <string.h>
+#include <unistd.h>
+
+#include "winbase.h"
 #include "windef.h"
 #include "winerror.h"
 
diff --git a/windows/property.c b/windows/property.c
index 0772b81a6cf..bcb659107f7 100644
--- a/windows/property.c
+++ b/windows/property.c
@@ -5,6 +5,8 @@
  */
 
 #include <string.h>
+
+#include "wine/winuser16.h"
 #include "win.h"
 #include "heap.h"
 #include "debug.h"
diff --git a/windows/rect.c b/windows/rect.c
index 58340640335..b0c8f272894 100644
--- a/windows/rect.c
+++ b/windows/rect.c
@@ -5,9 +5,9 @@
  *
  */
 
+#include "wine/winuser16.h"
 #include "winuser.h"
 
-
 /***********************************************************************
  *           SetRect16    (USER.72)
  */
diff --git a/windows/sysmetrics.c b/windows/sysmetrics.c
index b2b832c1a7d..6d52adaecf5 100644
--- a/windows/sysmetrics.c
+++ b/windows/sysmetrics.c
@@ -6,6 +6,8 @@
  */
 
 #include <stdio.h>
+
+#include "wine/winuser16.h"
 #include "winbase.h"
 #include "winuser.h"
 #include "monitor.h"