Inclusion cleanups in headers

diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h
index 1b3644078094dbd2d3adaf5ea5ffe0028cfb9adc..f2ceaaa4bfb87e75826fc897aa51c8e8387ae0e2 100644 (file)
--- a/gdk/gdkmain.h
+++ b/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

diff --git a/gdk/gdkrectangle.h b/gdk/gdkrectangle.h
index de72b29f2de28c11a565541437bfff24400b19d1..9555457d4cc400cdf591ab4908092422dff97c78 100644 (file)
--- a/gdk/gdkrectangle.h
+++ b/gdk/gdkrectangle.h
@@ -31,6 +31,8 @@
 #ifndef __GDK_RECTANGLE_H__
 #define __GDK_RECTANGLE_H__
 
+#include <gdk/gdktypes.h>
+
 G_BEGIN_DECLS
 
 /* Rectangle utilities

diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index 9e1e606e8dd054553a8d25817efe5ce057fa2b89..4b27e6034f4f54be94caeb17236a984de8a466a5 100644 (file)
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -29,8 +29,8 @@
 #define __GDK_SCREEN_H__
 
 #include <cairo.h>
-#include "gdk/gdktypes.h"
-#include "gdk/gdkdisplay.h"
+#include <gdk/gdktypes.h>
+#include <gdk/gdkdisplay.h>
 
 G_BEGIN_DECLS
 

diff --git a/gdk/gdkthreads.h b/gdk/gdkthreads.h
index 9b2517173f3487d025be48c66157c7bf66d595af..743e6ec6fa1b79561d7fcbc5970770b014ed0dab 100644 (file)
--- a/gdk/gdkthreads.h
+++ b/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);

diff --git a/gdk/x11/gdkasync.h b/gdk/x11/gdkasync.h
index 44aa18c47c69403da5bf5f697e0d12d990eb0176..eebea396a60e0193f89d486c04d32e6f5de4cbfb 100644 (file)
--- a/gdk/x11/gdkasync.h
+++ b/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
 

diff --git a/gdk/x11/gdkdevice-xi2.h b/gdk/x11/gdkdevice-xi2.h
index 67e4dc940a274b92d25acb09ee1d9079690ae5e3..2fa306474439f1fa3921f39ef23c01656331460d 100644 (file)
--- a/gdk/x11/gdkdevice-xi2.h
+++ b/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
 

diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
index b4036cb59131462bc4bb5686215b159f54109332..9ac0c3ae0253b8714e4a9f9adfba68466b96b657 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.h
+++ b/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
 

diff --git a/gdk/x11/gdkdrawable-x11.h b/gdk/x11/gdkdrawable-x11.h
index 16c89533323a374bbe5d89686270f7c23ed44820..e197766cbaf4d4be056880072958a2dc9d255832 100644 (file)
--- a/gdk/x11/gdkdrawable-x11.h
+++ b/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

diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 67e1c37148e582555b5757dc0c455c821503e157..bfcf1e38f80af778d308e6ddf1deafc718feaf16 100644 (file)
--- a/gdk/x11/gdkprivate-x11.h
+++ b/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/x11/gdkdisplay-x11.h>
-
-#include "gdk/gdkinternals.h"
+#include <gdk/gdkinternals.h>
+#include "gdkwindow-x11.h"
+#include "gdkdisplay-x11.h"
+#include <cairo-xlib.h>
 
 typedef struct _GdkCursorPrivate       GdkCursorPrivate;
 

diff --git a/gdk/x11/gdkscreen-x11.h b/gdk/x11/gdkscreen-x11.h
index 07fec614a3df3cc367c7385a301dc09f8ca25735..72c0ead90062df754714278b896d9f65f0ba99bc 100644 (file)
--- a/gdk/x11/gdkscreen-x11.h
+++ b/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>
 

diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index a0cc7dd36addbf20eaa496b2d0339e10a9684f04..b9f91a88772a4141e397de372e35b6bad4fbca84 100644 (file)
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -28,7 +28,6 @@
 #define __GDK_X_H__
 
 #include <gdk/gdkprivate.h>
-
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 

diff --git a/gdk/x11/xsettings-common.h b/gdk/x11/xsettings-common.h
index 1479f299ada672cd56aaf08a6afa7a137fea4b27..de7367a6c2f6c405e44599ef0b0bf24f0ba1923d 100644 (file)
--- a/gdk/x11/xsettings-common.h
+++ b/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 */