diff --git a/files/drive.c b/files/drive.c
index 75261020f0e..f8290500a86 100644
--- a/files/drive.c
+++ b/files/drive.c
@@ -32,8 +32,9 @@
 # endif
 #endif
 
-#include "windows.h"
 #include "winbase.h"
+#include "wine/winbase16.h"   /* for GetCurrentTask */
+#include "wine/winestring.h"  /* for lstrcpyAtoW */
 #include "winerror.h"
 #include "drive.h"
 #include "file.h"
diff --git a/ole/compobj.c b/ole/compobj.c
index 0f2537b1dcb..856135dda50 100644
--- a/ole/compobj.c
+++ b/ole/compobj.c
@@ -33,7 +33,8 @@
 #include <string.h>
 #include <time.h>
 #include <assert.h>
-#include "windows.h"
+#include "wine/winbase16.h"
+#include "wine/winestring.h"
 #include "winerror.h"
 #include "ole.h"
 #include "ole2.h"
diff --git a/resources/sysres.c b/resources/sysres.c
index 4cd9ff595fc..758e632dccd 100644
--- a/resources/sysres.c
+++ b/resources/sysres.c
@@ -4,7 +4,8 @@
  * Copyright 1995 Alexandre Julliard
  */
 
-#include "windows.h"
+#include "winbase.h"
+#include "wine/winbase16.h"
 #include "global.h"
 #include "options.h"
 #include "resource.h"