Added missing includes to avoid warnings/errors.
diff --git a/msdos/int20.c b/msdos/int20.c
index f6be7ad..4743b74 100644
--- a/msdos/int20.c
+++ b/msdos/int20.c
@@ -3,6 +3,7 @@
*/
#include <stdlib.h>
+#include "winbase.h"
#include "miscemu.h"
/* #define DEBUG_INT */
#include "debug.h"
diff --git a/ole/safearray.c b/ole/safearray.c
index fe383e7..8a77d2f 100644
--- a/ole/safearray.c
+++ b/ole/safearray.c
@@ -9,7 +9,7 @@
#include <wintypes.h>
#include <winerror.h>
-#include <winnt.h>
+#include <winbase.h>
#include <oleauto.h>
#include <ole.h>
#include <strings.h>
diff --git a/relay32/builtin32.c b/relay32/builtin32.c
index f72e0b6..2dbbc89 100644
--- a/relay32/builtin32.c
+++ b/relay32/builtin32.c
@@ -6,6 +6,7 @@
#include <assert.h>
#include <string.h>
+#include "winuser.h"
#include "builtin32.h"
#include "peexe.h"
#include "heap.h"
diff --git a/server/device.c b/server/device.c
index 3ded814..83446f4 100644
--- a/server/device.c
+++ b/server/device.c
@@ -17,7 +17,7 @@
#include <string.h>
#include "winerror.h"
-#include "winnt.h"
+#include "winbase.h"
#include "server/thread.h"
struct device
diff --git a/server/file.c b/server/file.c
index 3c5e816..e624998 100644
--- a/server/file.c
+++ b/server/file.c
@@ -18,7 +18,7 @@
#include <utime.h>
#include "winerror.h"
-#include "winnt.h"
+#include "winbase.h"
#include "server/thread.h"
struct file
diff --git a/server/pipe.c b/server/pipe.c
index 1f92d10..06260f9 100644
--- a/server/pipe.c
+++ b/server/pipe.c
@@ -17,7 +17,7 @@
#include <unistd.h>
#include "winerror.h"
-#include "winnt.h"
+#include "winbase.h"
#include "server/thread.h"
enum side { READ_SIDE, WRITE_SIDE };
diff --git a/server/thread.c b/server/thread.c
index 5e5e3d6..5bf2f70 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -13,8 +13,10 @@
#include <sys/types.h>
#include <sys/uio.h>
#include <unistd.h>
+#include <stdarg.h>
-#include "winnt.h"
+
+#include "winbase.h"
#include "winerror.h"
#include "server.h"
#include "server/thread.h"
diff --git a/windows/winhelp.c b/windows/winhelp.c
index 0dffbfa..c8ac998 100644
--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -8,6 +8,7 @@
#include <unistd.h>
#include "debug.h"
#include "wine/winuser16.h"
+#include "wine/winbase16.h"
#include "heap.h"
#include "ldt.h"