gdi32: Don't include wingdi16.h by default.

dlls/gdi32/bidi.c

@@ -46,6 +46,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
+#include "winnls.h"
 #include "wine/debug.h"
 #include "gdi_private.h"
 

dlls/gdi32/driver.c

@@ -29,6 +29,7 @@
 #include "winbase.h"
 #include "winreg.h"
 #include "ddrawgdi.h"
+#include "wine/winbase16.h"
 
 #include "gdi_private.h"
 #include "wine/unicode.h"

dlls/gdi32/enhmetafile.c

@@ -43,6 +43,7 @@
 #include "wingdi.h"
 #include "winnls.h"
 #include "winerror.h"
+#include "wine/wingdi16.h"
 #include "gdi_private.h"
 #include "wine/debug.h"
 

dlls/gdi32/enhmfdrv/init.c

@@ -25,6 +25,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
+#include "winnls.h"
 #include "gdi_private.h"
 #include "enhmfdrv/enhmetafiledrv.h"
 #include "wine/debug.h"

dlls/gdi32/freetype.c

@@ -84,6 +84,7 @@
 #include "winreg.h"
 #include "wingdi.h"
 #include "gdi_private.h"
+#include "wine/library.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
 #include "wine/list.h"

dlls/gdi32/gdi_main.c

@@ -23,6 +23,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
+#include "wine/winbase16.h"
 #include "gdi_private.h"
 
 /***********************************************************************

dlls/gdi32/gdi_private.h

@@ -22,7 +22,10 @@
 #define __WINE_GDI_PRIVATE_H
 
 #include <math.h>
-#include "wine/wingdi16.h"
+#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
 
 /* Metafile defines */
 #define META_EOF 0x0000

dlls/gdi32/gdiobj.c

@@ -29,6 +29,7 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winreg.h"
+#include "winnls.h"
 #include "winerror.h"
 #include "winternl.h"
 

dlls/gdi32/metafile.c

@@ -55,7 +55,9 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winreg.h"
+#include "winnls.h"
 #include "winternl.h"
+#include "wine/wingdi16.h"
 #include "gdi_private.h"
 #include "wine/debug.h"
 

dlls/gdi32/mfdrv/graphics.c

@@ -18,9 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "wine/wingdi16.h"
 #include "mfdrv/metafiledrv.h"
 #include "wine/debug.h"
 

dlls/gdi32/mfdrv/init.c

@@ -23,6 +23,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winnls.h"
 #include "gdi_private.h"
 #include "mfdrv/metafiledrv.h"
 #include "wine/debug.h"

dlls/gdi32/mfdrv/mapping.c

@@ -18,6 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
 #include "gdi_private.h"
 #include "mfdrv/metafiledrv.h"
 

dlls/gdi32/mfdrv/objects.c

@@ -27,6 +27,7 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "wownt32.h"
+#include "wine/wingdi16.h"
 #include "mfdrv/metafiledrv.h"
 #include "gdi_private.h"
 #include "wine/debug.h"

dlls/gdi32/mfdrv/text.c

@@ -23,6 +23,7 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "wine/wingdi16.h"
 #include "mfdrv/metafiledrv.h"
 #include "wine/debug.h"
 

dlls/gdi32/printdrv.c

@@ -26,6 +26,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
+#include "winnls.h"
 #include "winspool.h"
 #include "winerror.h"
 #include "wine/debug.h"