Fixes to the win32 backend to actually be able to compile within a

directory hierarchy like this, with common gdk.h and gdktypes.h
for all backends. gdkrectangles.c and gdkrgb.c is copied before
compilation from the x11 backed (which still is in .., but
eventually will be in ..\x11).

gdk/win32/gdk.c

@@ -33,12 +33,11 @@
 #include <limits.h>
 #include <io.h>
 
-#include "gdk.h"
-#include "gdkprivate.h"
-#include "gdkinput.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
+#include <gdk/gdki18n.h>
 #include "gdkx.h"
-#include "gdkkeysyms.h"
-#include "gdki18n.h"
+#include "gdkinput.h"
 
 static void	 gdkx_XConvertCase	(KeySym	       symbol,
 					 KeySym	      *lower,
@@ -2090,7 +2089,7 @@ gdk_keys_keyval_compare (const void *pkey, const void *pbase)
   return (*(int *) pkey) - ((struct gdk_key *) pbase)->keyval;
 }
 
-const gchar*
+gchar*
 gdk_keyval_name (guint	      keyval)
 {
   struct gdk_key *found =

gdk/win32/gdkcc.c

@@ -64,8 +64,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "gdk.h"
-#include "gdkprivate.h"
+
 #include "gdkx.h"
 
 #define MAX_IMAGE_COLORS 256

gdk/win32/gdkcolor-win32.c

@@ -31,8 +31,6 @@
 #include <string.h>
 #include <time.h>
 
-#include "gdk.h"
-#include "gdkprivate.h"
 #include "gdkx.h"
 
 #ifdef _MSC_VER

gdk/win32/gdkcolor.c

@@ -31,8 +31,6 @@
 #include <string.h>
 #include <time.h>
 
-#include "gdk.h"
-#include "gdkprivate.h"
 #include "gdkx.h"
 
 #ifdef _MSC_VER

gdk/win32/gdkconfig.h

 /* Handcrafted for Win32 */
 
 #define GDK_WINDOWING GDK_WINDOWING_WIN32
+#define GDK_HAVE_WCHAR_H 1
+#define GDK_HAVE_WCTYPE_H 1

gdk/win32/gdkcursor-win32.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 static const struct { const char *name; int type; } cursors[] = {

gdk/win32/gdkcursor.c

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 static const struct { const char *name; int type; } cursors[] = {

gdk/win32/gdkdnd-win32.c

@@ -30,13 +30,14 @@
 #define INITGUID
 
 #include <string.h>
-#include "gdk.h"
-#include "gdkx.h"
-#include "gdk/gdkprivate.h"
+
 #include <ole2.h>
 #include <shlobj.h>
 #include <shlguid.h>
 
+#include <gdk/gdk.h>
+#include "gdkx.h"
+
 typedef struct _GdkDragContextPrivate GdkDragContextPrivate;
 
 typedef enum {

gdk/win32/gdkdnd.c

@@ -30,13 +30,14 @@
 #define INITGUID
 
 #include <string.h>
-#include "gdk.h"
-#include "gdkx.h"
-#include "gdk/gdkprivate.h"
+
 #include <ole2.h>
 #include <shlobj.h>
 #include <shlguid.h>
 
+#include <gdk/gdk.h>
+#include "gdkx.h"
+
 typedef struct _GdkDragContextPrivate GdkDragContextPrivate;
 
 typedef enum {

gdk/win32/gdkdraw.c

@@ -27,7 +27,7 @@
 #include "config.h"
 
 #include <math.h>
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 #ifndef M_TWOPI

gdk/win32/gdkdrawable-win32.c

@@ -27,7 +27,7 @@
 #include "config.h"
 
 #include <math.h>
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 #ifndef M_TWOPI

gdk/win32/gdkevents-win32.c

@@ -28,11 +28,10 @@
 #include "config.h"
 
 #include <stdio.h>
-#include "gdk.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
 #include "gdkx.h"
-#include "gdkprivate.h"
 #include "gdkinput.h"
-#include "gdkkeysyms.h"
 
 #define PING() printf("%s: %d\n",__FILE__,__LINE__),fflush(stdout)
 

gdk/win32/gdkevents.c

@@ -28,11 +28,10 @@
 #include "config.h"
 
 #include <stdio.h>
-#include "gdk.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
 #include "gdkx.h"
-#include "gdkprivate.h"
 #include "gdkinput.h"
-#include "gdkkeysyms.h"
 
 #define PING() printf("%s: %d\n",__FILE__,__LINE__),fflush(stdout)
 

gdk/win32/gdkfont-win32.c

@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 GdkFont*

gdk/win32/gdkfont.c

@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 GdkFont*

gdk/win32/gdkgc-win32.c

@@ -27,7 +27,7 @@
 #include "config.h"
 #include <string.h>
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 GdkGC*

gdk/win32/gdkgc.c

@@ -27,7 +27,7 @@
 #include "config.h"
 #include <string.h>
 
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 GdkGC*

gdk/win32/gdkglobals-win32.c

@@ -25,7 +25,7 @@
  */
 
 #include <stdio.h>
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 guint             gdk_debug_flags = 0;

gdk/win32/gdkglobals.c

@@ -25,7 +25,7 @@
  */
 
 #include <stdio.h>
-#include "gdk.h"
+#include <gdk/gdk.h>
 #include "gdkprivate.h"
 
 guint             gdk_debug_flags = 0;