diff --git a/include/authors.h b/include/authors.h
index 46ecd7f238c..a3a70ce4c6e 100644
--- a/include/authors.h
+++ b/include/authors.h
@@ -253,7 +253,7 @@ static const char * const SHELL_People[] =
     "Nathan Zorich",
     "Luiz Otavio L. Zorzella",
     "Per Ångström",
-    NULL
+    0
 };
 
 #endif  /* __WINE_AUTHORS_H */
diff --git a/include/comm.h b/include/comm.h
index 7adcbbdf68d..701eddbf7e2 100644
--- a/include/comm.h
+++ b/include/comm.h
@@ -1,6 +1,8 @@
 #ifndef __WINE_COMM_H
 #define __WINE_COMM_H
 
+#include "windef.h"
+
 #define MAX_PORTS   9
 
 struct DosDeviceStruct {
diff --git a/include/datetime.h b/include/datetime.h
index 28ecd7013d2..636123897bc 100644
--- a/include/datetime.h
+++ b/include/datetime.h
@@ -9,6 +9,7 @@
 #define __WINE_DATETIME_H
 
 #include "windef.h"
+#include "winbase.h"
 
 typedef struct tagDATETIME_INFO
 {
diff --git a/include/monthcal.h b/include/monthcal.h
index 205bf6b1d52..556fc9f36a8 100644
--- a/include/monthcal.h
+++ b/include/monthcal.h
@@ -8,6 +8,10 @@
 #ifndef __WINE_MONTHCAL_H
 #define __WINE_MONTHCAL_H
 
+#include "commctrl.h"
+#include "windef.h"
+#include "wingdi.h"
+
 #define MC_SEL_LBUTUP		0			/* Left button released */
 #define MC_SEL_LBUTDOWN		1			/* Left button pressed in calendar */
 #define MC_PREVPRESSED      1           /* Prev month button pressed */
diff --git a/include/netspi.h b/include/netspi.h
index 884b88e2285..af8d2ac0e24 100644
--- a/include/netspi.h
+++ b/include/netspi.h
@@ -6,6 +6,7 @@
 #define _NETSPI_H_
 
 #include "windef.h"
+#include "winnetwk.h"
 
 /*
  * Note: The Unicode variants of all these routines/structures
diff --git a/include/ntsecapi.h b/include/ntsecapi.h
index ec3a19f6e52..662c1013341 100644
--- a/include/ntsecapi.h
+++ b/include/ntsecapi.h
@@ -2,6 +2,7 @@
 #define __WINE_NTSECAPI_H
 
 #include "ntdef.h"
+#include "winnt.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/psdrv.h b/include/psdrv.h
index dda676c35ae..dac9f7654e8 100644
--- a/include/psdrv.h
+++ b/include/psdrv.h
@@ -83,6 +83,8 @@ typedef struct {
     float	x, y;
 } PAPERDIMENSION;
 
+/* Solaris kludge */
+#undef PAGESIZE
 typedef struct _tagPAGESIZE {
     char		*Name;
     char		*FullName;
diff --git a/include/wine/obj_connection.h b/include/wine/obj_connection.h
index 832b5adf084..0f8efccae06 100644
--- a/include/wine/obj_connection.h
+++ b/include/wine/obj_connection.h
@@ -7,7 +7,7 @@
 #ifndef __WINE_WINE_OBJ_CONNECTION_H
 #define __WINE_WINE_OBJ_CONNECTION_H
 
-
+#include "wine/obj_base.h"
 #include "winbase.h"
 
 #ifdef __cplusplus
diff --git a/include/wine/obj_oleundo.h b/include/wine/obj_oleundo.h
index c4635ce99d1..5f676c6180d 100644
--- a/include/wine/obj_oleundo.h
+++ b/include/wine/obj_oleundo.h
@@ -7,7 +7,11 @@
 #ifndef __WINE_WINE_OBJ_OLEUNDO_H
 #define __WINE_WINE_OBJ_OLEUNDO_H
 
-
+#include "wine/obj_base.h"
+#include "wine/obj_dataobject.h"
+#include "wine/obj_inplace.h"
+#include "wine/obj_olefont.h"
+#include "wine/obj_property.h"
 #include "winbase.h"
 
 #ifdef __cplusplus
diff --git a/include/wine/obj_picture.h b/include/wine/obj_picture.h
index cde812e1122..c39d9496b31 100644
--- a/include/wine/obj_picture.h
+++ b/include/wine/obj_picture.h
@@ -7,6 +7,8 @@
 #ifndef __WINE_WINE_OBJ_PICTURE_H
 #define __WINE_WINE_OBJ_PICTURE_H
 
+#include "wine/obj_base.h"
+#include "wine/obj_oleaut.h"
 #include "windows.h"
 #include "windef.h"
 
diff --git a/include/wine/obj_property.h b/include/wine/obj_property.h
index 94a4e1b1f73..c6687532ddd 100644
--- a/include/wine/obj_property.h
+++ b/include/wine/obj_property.h
@@ -7,9 +7,10 @@
 #ifndef __WINE_WINE_OBJ_PROPERTY_H
 #define __WINE_WINE_OBJ_PROPERTY_H
 
-
-#include "winbase.h"
 #include "wine/obj_oleaut.h" /* for DISPID */
+#include "wine/obj_storage.h"
+#include "winbase.h"
+#include "winuser.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/wine/obj_shellextinit.h b/include/wine/obj_shellextinit.h
index ba03b30af79..7e245ae0278 100644
--- a/include/wine/obj_shellextinit.h
+++ b/include/wine/obj_shellextinit.h
@@ -5,6 +5,7 @@
 #ifndef __WINE_WINE_OBJ_SHELLEXTINIT_H
 #define __WINE_WINE_OBJ_SHELLEXTINIT_H
 
+#include "shell.h"
 #include "winbase.h"
 #include "winuser.h"
 #include "wine/obj_base.h"
diff --git a/include/wine/winnet16.h b/include/wine/winnet16.h
index 21a84e0e351..67bab0d109c 100644
--- a/include/wine/winnet16.h
+++ b/include/wine/winnet16.h
@@ -8,6 +8,8 @@
 #ifndef __WINE_WINNET16_H
 #define __WINE_WINNET16_H
 
+#include "windef.h"
+
 /*
  * Remote printing
  */
diff --git a/include/winspool.h b/include/winspool.h
index 000b12c101b..5aeadd0e88b 100644
--- a/include/winspool.h
+++ b/include/winspool.h
@@ -605,12 +605,12 @@ DECL_WINELIB_TYPE_AW(LPFORM_INFO_1)
 
 typedef struct _PRINTPROCESSOR_INFO_1A {
   LPSTR pName;
-} PRINTPROCESSOR_INFO_1A, *PPRINTERPROCESSOR_INFO_1A,
+} PRINTPROCESSOR_INFO_1A, *PPRINTPROCESSOR_INFO_1A,
   *LPPRINTPROCESSOR_INFO_1A;
 
 typedef struct _PRINTPROCESSOR_INFO_1W {
   LPWSTR pName;
-} PRINTPROCESSOR_INFO_1W, *PPRINTERPROCESSOR_INFO_1W,
+} PRINTPROCESSOR_INFO_1W, *PPRINTPROCESSOR_INFO_1W,
   *LPPRINTPROCESSOR_INFO_1W;
 
 DECL_WINELIB_TYPE_AW(PRINTPROCESSOR_INFO_1)
diff --git a/include/xmalloc.h b/include/xmalloc.h
index 0e1c5658bf6..cc44c33974a 100644
--- a/include/xmalloc.h
+++ b/include/xmalloc.h
@@ -5,6 +5,8 @@
 extern "C" {
 #endif
 
+#include <sys/types.h>
+
 void *xmalloc( size_t size );
 void *xcalloc( size_t size );
 void *xrealloc( void *ptr, size_t size );
diff --git a/tools/make_authors b/tools/make_authors
index 26536465c23..6f35aeeb3f9 100755
--- a/tools/make_authors
+++ b/tools/make_authors
@@ -52,7 +52,7 @@ for ($i = 0; $i <= $#authors; $i++)
   {
     print NEWAUTHORS_H "    \"$authors[$i]\",\n";
   }
-print NEWAUTHORS_H "    NULL\n};\n";
+print NEWAUTHORS_H "    0\n};\n";
 print NEWAUTHORS_H "\n#endif  /* __WINE_AUTHORS_H */\n";
 
 print "Created include/authors.h\n";