Made the include files self-sufficient.

include/authors.h

@@ -253,7 +253,7 @@ static const char * const SHELL_People[] =
     "Nathan Zorich",
     "Luiz Otavio L. Zorzella",
     "Per ngstrm",
-    NULL
+    0
 };
 
 #endif  /* __WINE_AUTHORS_H */

include/comm.h

 #ifndef __WINE_COMM_H
 #define __WINE_COMM_H
 
+#include "windef.h"
+
 #define MAX_PORTS   9
 
 struct DosDeviceStruct {

include/datetime.h

@@ -9,6 +9,7 @@
 #define __WINE_DATETIME_H
 
 #include "windef.h"
+#include "winbase.h"
 
 typedef struct tagDATETIME_INFO
 {

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 */

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

include/ntsecapi.h

@@ -2,6 +2,7 @@
 #define __WINE_NTSECAPI_H
 
 #include "ntdef.h"
+#include "winnt.h"
 
 #ifdef __cplusplus
 extern "C" {

include/psdrv.h

@@ -83,6 +83,8 @@ typedef struct {
     float	x, y;
 } PAPERDIMENSION;
 
+/* Solaris kludge */
+#undef PAGESIZE
 typedef struct _tagPAGESIZE {
     char		*Name;
     char		*FullName;

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

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

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"
 

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" {

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"

include/wine/winnet16.h

@@ -8,6 +8,8 @@
 #ifndef __WINE_WINNET16_H
 #define __WINE_WINNET16_H
 
+#include "windef.h"
+
 /*
  * Remote printing
  */

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)

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 );

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";