Removed extra includes from ole.h and wingdi.h.
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 8ec347e..1dcb58b 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -35,6 +35,8 @@
#include <time.h>
#include <assert.h>
#include "windef.h"
+#include "wtypes.h"
+#include "wingdi.h"
#include "wine/winbase16.h"
#include "winerror.h"
#include "wownt32.h"
diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c
index a8cf092..0458929 100644
--- a/dlls/ole32/datacache.c
+++ b/dlls/ole32/datacache.c
@@ -31,14 +31,15 @@
* was stored but that's about it.
*/
#include <assert.h>
-#include "wingdi.h"
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winerror.h"
#include "wine/obj_oleview.h"
#include "wine/obj_cache.h"
#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(ole)
+DEFAULT_DEBUG_CHANNEL(ole);
/****************************************************************************
* PresentationDataHeader
diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c
index 088ed7e..001a8f9 100644
--- a/dlls/ole32/storage.c
+++ b/dlls/ole32/storage.c
@@ -10,10 +10,14 @@
#include <assert.h>
#include <time.h>
#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
#include "windef.h"
#include "winerror.h"
#include "wine/winestring.h"
#include "wine/winbase16.h"
+#include "wingdi.h"
+#include "wtypes.h"
#include "file.h"
#include "ole.h"
#include "wine/obj_base.h"
@@ -23,8 +27,8 @@
#include "ldt.h"
#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(ole)
-DECLARE_DEBUG_CHANNEL(relay)
+DEFAULT_DEBUG_CHANNEL(ole);
+DECLARE_DEBUG_CHANNEL(relay);
struct storage_header {
BYTE magic[8]; /* 00: magic */
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index 034e475..8dfbe4b 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -22,6 +22,16 @@
#include "config.h"
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <time.h>
+
+#ifdef HAVE_FLOAT_H
+# include <float.h>
+#endif
+
#include "windef.h"
#include "oleauto.h"
#include "heap.h"
@@ -29,16 +39,7 @@
#include "winerror.h"
#include "parsedt.h"
-DEFAULT_DEBUG_CHANNEL(ole)
-
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-#include <time.h>
-
-#ifdef HAVE_FLOAT_H
-# include <float.h>
-#endif
+DEFAULT_DEBUG_CHANNEL(ole);
#ifndef FLT_MAX
# ifdef MAXFLOAT
diff --git a/dlls/olecli/olecli_main.c b/dlls/olecli/olecli_main.c
index 2e5e4d6..6009a1c 100644
--- a/dlls/olecli/olecli_main.c
+++ b/dlls/olecli/olecli_main.c
@@ -6,11 +6,14 @@
/* At the moment, these are only empty stubs.
*/
+#include "windef.h"
+#include "wingdi.h"
+#include "wtypes.h"
#include "ole.h"
#include "gdi.h"
#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(ole)
+DEFAULT_DEBUG_CHANNEL(ole);
extern LONG OLE_current_handle;
diff --git a/dlls/olesvr/olesvr_main.c b/dlls/olesvr/olesvr_main.c
index dcce95b..6fa30a7 100644
--- a/dlls/olesvr/olesvr_main.c
+++ b/dlls/olesvr/olesvr_main.c
@@ -7,10 +7,13 @@
/* At the moment, these are only empty stubs.
*/
+#include "windef.h"
+#include "wingdi.h"
+#include "wtypes.h"
#include "ole.h"
#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(ole)
+DEFAULT_DEBUG_CHANNEL(ole);
LONG OLE_current_handle;
diff --git a/graphics/cache.c b/graphics/cache.c
index ea60390..54090b8 100644
--- a/graphics/cache.c
+++ b/graphics/cache.c
@@ -6,6 +6,7 @@
*
*/
+#include "windef.h"
#include "wingdi.h"
#include "cache.h"
diff --git a/graphics/escape.c b/graphics/escape.c
index 54ca020..b14cfc5 100644
--- a/graphics/escape.c
+++ b/graphics/escape.c
@@ -5,6 +5,7 @@
*/
#include <string.h>
+#include "windef.h"
#include "wingdi.h"
#include "gdi.h"
#include "heap.h"
@@ -12,7 +13,7 @@
#include "dc.h"
#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(driver)
+DEFAULT_DEBUG_CHANNEL(driver);
/***********************************************************************
* Escape16 [GDI.38]
diff --git a/graphics/ttydrv/text.c b/graphics/ttydrv/text.c
index b9ce6d2..b1b2713 100644
--- a/graphics/ttydrv/text.c
+++ b/graphics/ttydrv/text.c
@@ -6,13 +6,14 @@
#include "config.h"
-#include "wine/wingdi16.h"
+#include "windef.h"
+#include "wingdi.h"
#include "dc.h"
#include "debugtools.h"
#include "gdi.h"
#include "ttydrv.h"
-DEFAULT_DEBUG_CHANNEL(ttydrv)
+DEFAULT_DEBUG_CHANNEL(ttydrv);
/***********************************************************************
* TTYDRV_DC_ExtTextOut
diff --git a/include/color.h b/include/color.h
index 793fc2c..3c85e1e 100644
--- a/include/color.h
+++ b/include/color.h
@@ -1,6 +1,7 @@
#ifndef __WINE_COLOR_H
#define __WINE_COLOR_H
+#include "windef.h"
#include "wingdi.h"
#include "palette.h"
diff --git a/include/enhmetafiledrv.h b/include/enhmetafiledrv.h
index 9df7c6c..303e376 100644
--- a/include/enhmetafiledrv.h
+++ b/include/enhmetafiledrv.h
@@ -5,6 +5,7 @@
#ifndef __WINE_ENHMETAFILEDRV_H
#define __WINE_ENHMETAFILEDRV_H
+#include "windef.h"
#include "wingdi.h"
#include "gdi.h"
diff --git a/include/metafiledrv.h b/include/metafiledrv.h
index 1502218..19c6aac 100644
--- a/include/metafiledrv.h
+++ b/include/metafiledrv.h
@@ -5,6 +5,7 @@
#ifndef __WINE_METAFILEDRV_H
#define __WINE_METAFILEDRV_H
+#include "windef.h"
#include "wingdi.h"
#include "gdi.h"
diff --git a/include/ole.h b/include/ole.h
index 45b8879..2306b24 100644
--- a/include/ole.h
+++ b/include/ole.h
@@ -5,15 +5,6 @@
#ifndef __WINE_OLE_H
#define __WINE_OLE_H
-#include "wingdi.h" /* LOGPALETTE */
-
-/* FIXME: we need to include wtypes.h mainly, it seems, because we need BSTR.
- * Normally none of the APIs in ole.h depend on it. It is most likey that they should
- * be moved to ole2.h (which includes objbase.h and thus wtypes.h) or some other
- * OLE include
- */
-#include "wtypes.h"
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/include/psdrv.h b/include/psdrv.h
index 46a46ae..2902043 100644
--- a/include/psdrv.h
+++ b/include/psdrv.h
@@ -6,6 +6,7 @@
*
* Copyright 1998 Huw D M Davies
*/
+#include "windef.h"
#include "wingdi.h"
#include "font.h"
#include "pen.h"
diff --git a/include/win16drv.h b/include/win16drv.h
index 0fb32be..f5e7fb2 100644
--- a/include/win16drv.h
+++ b/include/win16drv.h
@@ -5,6 +5,7 @@
#ifndef __WINE_WIN16DRV_H
#define __WINE_WIN16DRV_H
+#include "windef.h"
#include "wingdi.h"
#include "gdi.h"
diff --git a/include/wingdi.h b/include/wingdi.h
index 404ea40..db6da44 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -1,8 +1,6 @@
#ifndef __WINE_WINGDI_H
#define __WINE_WINGDI_H
-#include "windef.h"
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/library/winestub.c b/library/winestub.c
index 3a3a120..1c0317b 100644
--- a/library/winestub.c
+++ b/library/winestub.c
@@ -1,7 +1,9 @@
/* Sample winestub.c file for compiling programs with libwine.so. */
#include <string.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "xmalloc.h"
diff --git a/misc/cdrom.c b/misc/cdrom.c
index ddce8ea..0a8ab8d 100644
--- a/misc/cdrom.c
+++ b/misc/cdrom.c
@@ -7,6 +7,8 @@
* Copyright 2000 Andreas Mohr
*/
+#include "config.h"
+
#include <errno.h>
#include <string.h>
#include <fcntl.h>
diff --git a/msdos/int2f.c b/msdos/int2f.c
index 4ccb013..e52149f 100644
--- a/msdos/int2f.c
+++ b/msdos/int2f.c
@@ -7,6 +7,8 @@
* (c) 1999 Eric Pouech
*/
+#include "config.h"
+
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff --git a/objects/linedda.c b/objects/linedda.c
index 084d60c..b48c2c2 100644
--- a/objects/linedda.c
+++ b/objects/linedda.c
@@ -5,6 +5,7 @@
*/
#include <stdlib.h>
+#include "windef.h"
#include "wingdi.h"
#include "wine/wingdi16.h"
