Inclusion cleanups in headers

gdk/gdkmain.h

@@ -31,7 +31,6 @@
 #ifndef __GDK_MAIN_H__
 #define __GDK_MAIN_H__
 
-#include <glib.h>
 #include <gdk/gdktypes.h>
 
 G_BEGIN_DECLS

gdk/gdkrectangle.h

@@ -31,6 +31,8 @@
 #ifndef __GDK_RECTANGLE_H__
 #define __GDK_RECTANGLE_H__
 
+#include <gdk/gdktypes.h>
+
 G_BEGIN_DECLS
 
 /* Rectangle utilities

gdk/gdkscreen.h

@@ -29,8 +29,8 @@
 #define __GDK_SCREEN_H__
 
 #include <cairo.h>
-#include "gdk/gdktypes.h"
+#include <gdk/gdktypes.h>
-#include "gdk/gdkdisplay.h"
+#include <gdk/gdkdisplay.h>
 
 G_BEGIN_DECLS
 

gdk/gdkthreads.h

@@ -31,6 +31,8 @@
 #ifndef __GDK_THREADS_H__
 #define __GDK_THREADS_H__
 
+#include <gdk/gdktypes.h>
+
 G_BEGIN_DECLS
 
 void     gdk_threads_init                     (void);

gdk/x11/gdkasync.h

@@ -21,8 +21,8 @@
 #ifndef __GDK_ASYNC_H__
 #define __GDK_ASYNC_H__
 
+#include <gdk/gdkdisplay.h>
 #include <X11/Xlib.h>
-#include "gdk.h"
 
 G_BEGIN_DECLS
 

gdk/x11/gdkdevice-xi2.h

@@ -21,6 +21,7 @@
 #define __GDK_DEVICE_XI2_H__
 
 #include <gdk/gdkdeviceprivate.h>
+#include <X11/extensions/XInput2.h>
 
 G_BEGIN_DECLS
 

gdk/x11/gdkdisplay-x11.h

@@ -24,14 +24,13 @@
 #ifndef __GDK_DISPLAY_X11__
 #define __GDK_DISPLAY_X11__
 
-#include <X11/X.h>
-#include <X11/Xlib.h>
-#include <glib.h>
 #include <gdk/gdkdisplay.h>
 #include <gdk/gdkkeys.h>
 #include <gdk/gdkwindow.h>
 #include <gdk/gdkinternals.h>
-#include <gdk/gdk.h>		/* For gdk_get_program_class() */
+#include <gdk/gdkmain.h>
+#include <X11/X.h>
+#include <X11/Xlib.h>
 
 G_BEGIN_DECLS
 

gdk/x11/gdkdrawable-x11.h

@@ -28,7 +28,6 @@
 #define __GDK_DRAWABLE_X11_H__
 
 #include <gdk/gdkdrawable.h>
-
 #include <X11/Xlib.h>
 
 G_BEGIN_DECLS

gdk/x11/gdkprivate-x11.h

@@ -31,14 +31,12 @@
 #ifndef __GDK_PRIVATE_X11_H__
 #define __GDK_PRIVATE_X11_H__
 
-#include <cairo-xlib.h>
-
 #include <gdk/gdkcursor.h>
 #include <gdk/gdkprivate.h>
-#include <gdk/x11/gdkwindow-x11.h>
+#include <gdk/gdkinternals.h>
-#include <gdk/x11/gdkdisplay-x11.h>
+#include "gdkwindow-x11.h"
-
+#include "gdkdisplay-x11.h"
-#include "gdk/gdkinternals.h"
+#include <cairo-xlib.h>
 
 typedef struct _GdkCursorPrivate       GdkCursorPrivate;
 

gdk/x11/gdkscreen-x11.h

@@ -24,10 +24,10 @@
 #ifndef __GDK_SCREEN_X11_H__
 #define __GDK_SCREEN_X11_H__
 
-#include "gdkprivate-x11.h"
-#include "xsettings-client.h"
 #include <gdk/gdkscreen.h>
 #include <gdk/gdkvisual.h>
+#include "gdkprivate-x11.h"
+#include "xsettings-client.h"
 #include <X11/X.h>
 #include <X11/Xlib.h>
 

gdk/x11/gdkx.h

@@ -28,7 +28,6 @@
 #define __GDK_X_H__
 
 #include <gdk/gdkprivate.h>
-
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 

gdk/x11/xsettings-common.h

@@ -23,6 +23,8 @@
 #ifndef XSETTINGS_COMMON_H
 #define XSETTINGS_COMMON_H
 
+#include <unistd.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */