Inclusion cleanups in sources

Try to do inclusions in the same sequence, more or less.

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 6d5bbc154eadfebd1c89e325be3cac2311cb3a7b..ba6582db6664c22f669edb487810dbe08468ce52 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -26,10 +26,8 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <stdlib.h>
+#include "gdkmain.h"
 
-#include "gdk.h"
 #include "gdkinternals.h"
 #include "gdkintl.h"
 
@@ -37,6 +35,9 @@
 #include "gdkkeysyms.h"
 #endif
 
+#include <string.h>
+#include <stdlib.h>
+
 typedef struct _GdkPredicate  GdkPredicate;
 
 struct _GdkPredicate

diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c
index aa37ca7fc6cb9cf474e363b193e2d5e8532a0f8b..46fd99a4fd9222396152cb63eccc74c1e50784da 100644 (file)
--- a/gdk/gdkapplaunchcontext.c
+++ b/gdk/gdkapplaunchcontext.c
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include "gdkapplaunchcontext.h"
+
 #include "gdkinternals.h"
 #include "gdkscreen.h"
 #include "gdkintl.h"

diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c
index ee7561ab3de7d09945571f5d5e6517351f2abf2d..5e711b6ab659502ccf0f91333f9084fabffe6900 100644 (file)
--- a/gdk/gdkcairo.c
+++ b/gdk/gdkcairo.c
@@ -17,13 +17,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "gdkcairo.h"
+#include "config.h"
 
-#include <math.h>
+#include "gdkcairo.h"
 
 #include "gdkdrawable.h"
 #include "gdkinternals.h"
 
+#include <math.h>
 
 /**
  * SECTION:cairo_interaction

diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index 125739903001745493eb966731c96486ad9e9340..d4ab63cb28816d9577ac97dee62564085cf65f9a 100644 (file)
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@@ -25,12 +25,13 @@
  */
 
 #include "config.h"
-#include <time.h>
 
-#include "gdkscreen.h"
 #include "gdkcolor.h"
+
+#include "gdkscreen.h"
 #include "gdkinternals.h"
 
+#include <time.h>
 
 /**
  * SECTION:colors

diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index dbed4f2e107b6933a844883545cb149b2d4482fb..0aabd5940a967a90b7dc6d37903d82ea8b62fa9f 100644 (file)
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -25,7 +25,9 @@
  */
 
 #include "config.h"
+
 #include "gdkcursor.h"
+
 #include "gdkdisplay.h"
 #include "gdkinternals.h"
 

diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 4c9421726d78adca024a745e4f477013b81c2e1e..aaf49899312bba27d08319708efa82069618aaa6 100644 (file)
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -18,7 +18,9 @@
  */
 
 #include "config.h"
+
 #include "gdkdevice.h"
+
 #include "gdkdeviceprivate.h"
 #include "gdkintl.h"
 #include "gdkinternals.h"

diff --git a/gdk/gdkdevicemanager.c b/gdk/gdkdevicemanager.c
index 8f1457b62edf81d86c99a1ba35afe1b8d96f245e..2edaa287059e00c62571a456ed3a73423cc4dec7 100644 (file)
--- a/gdk/gdkdevicemanager.c
+++ b/gdk/gdkdevicemanager.c
@@ -18,7 +18,9 @@
  */
 
 #include "config.h"
+
 #include "gdkdevicemanager.h"
+
 #include "gdkintl.h"
 #include "gdkinternals.h"
 

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 39ccd25db2e570a752c98e93d0af1fbe476c997e..2f3050965ad5c1ef5b607a3fd9482ea6a78c3438 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -22,15 +22,17 @@
  */
 
 #include "config.h"
-#include <math.h>
-#include <glib.h>
-#include "gdk.h"               /* gdk_event_send_client_message() */
+
 #include "gdkdisplay.h"
+
+#include "gdkevents.h"
 #include "gdkwindowimpl.h"
 #include "gdkinternals.h"
 #include "gdkmarshalers.h"
 #include "gdkscreen.h"
 
+#include <glib.h>
+#include <math.h>
 
 enum {
   OPENED,

diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 93a632eec385f9294147a38e6bb31756ba21289c..5da2c02184329ae82f477890f108ce753c74aed6 100644 (file)
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -26,13 +26,12 @@
 
 #include "config.h"
 
-#include "gdkscreen.h"
-#include "gdkdisplay.h"
 #include "gdkdisplaymanager.h"
 
+#include "gdkscreen.h"
+#include "gdkdisplay.h"
 #include "gdkinternals.h"
 #include "gdkmarshalers.h"
-
 #include "gdkintl.h"
 
 

diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c
index 49b9d04cf6e5198ecaa09c6e2907db7a196fd7fd..cccae0968a5a727a7929b3eff6f54cac9aeddf57 100644 (file)
--- a/gdk/gdkdnd.c
+++ b/gdk/gdkdnd.c
@@ -25,9 +25,11 @@
  */
 
 #include "config.h"
-#include <gdkdnd.h>
-#include <gdkdisplay.h>
-#include <gdkwindow.h>
+
+#include "gdkdnd.h"
+
+#include "gdkdisplay.h"
+#include "gdkwindow.h"
 
 
 /**

diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c
index 2c5c4e2630cbd0de9154ff8bfaf32ba1fae3a966..d31dfd9a66264353895a75df110180e05ac45c17 100644 (file)
--- a/gdk/gdkdraw.c
+++ b/gdk/gdkdraw.c
@@ -25,16 +25,18 @@
  */
 
 #include "config.h"
-#include <math.h>
-#include <pango/pangocairo.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "gdkcairo.h"
+
 #include "gdkdrawable.h"
+
+#include "gdkcairo.h"
 #include "gdkinternals.h"
 #include "gdkwindow.h"
 #include "gdkscreen.h"
 #include "gdkpixbuf.h"
 
+#include <pango/pangocairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <math.h>
 
 G_DEFINE_ABSTRACT_TYPE (GdkDrawable, gdk_drawable, G_TYPE_OBJECT)
 

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index f44a658f0d0d3c652a421acaaf104c16dc86a50f..7fd197ec0bee9561a8903920af63c409a8d39e8d 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -25,12 +25,11 @@
  */
 
 #include "config.h"
-#include <string.h>            /* For memset() */
-#include <math.h>
 
-#include "gdk.h"
 #include "gdkinternals.h"
 
+#include <string.h>
+#include <math.h>
 
 typedef struct _GdkIOClosure GdkIOClosure;
 

diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c
index fc734958729f28678e56e76a6fef2ae3ce5abce0..5413886694bfa1eda9320ab5532e17f313bb9e81 100644 (file)
--- a/gdk/gdkglobals.c
+++ b/gdk/gdkglobals.c
@@ -26,11 +26,11 @@
 
 #include "config.h"
 
-#include <stdio.h>
-
 #include "gdktypes.h"
 #include "gdkprivate.h"
 
+#include <stdio.h>
+
 
 guint               _gdk_debug_flags = 0;
 GList              *_gdk_default_filters = NULL;

diff --git a/gdk/gdkkeynames.c b/gdk/gdkkeynames.c
index 0e5ad1af55455c01e3fd13f525d004dfbc95d0ab..bbebc3b26bc36d27bce8d17f8a9838bcc57657a9 100644 (file)
--- a/gdk/gdkkeynames.c
+++ b/gdk/gdkkeynames.c
@@ -25,9 +25,6 @@
  */
 
 #include "config.h"
-#include <glib/gprintf.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "gdkkeysyms.h"
 #include "gdkinternals.h"
@@ -36,6 +33,10 @@
 
 #include "keyname-table.h"
 
+#include <glib/gprintf.h>
+#include <stdlib.h>
+#include <string.h>
+
 #define GDK_NUM_KEYS G_N_ELEMENTS (gdk_keys_by_keyval)
 
 static int

diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index b8fb27a5da663bf1ee34e67e9d263b109e250db3..872576f6d3fd83b0ba814602a6d53a174c5f158a 100644 (file)
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -26,9 +26,10 @@
 
 #include "config.h"
 
-#include "gdkdisplay.h"
 #include "gdkkeys.h"
 
+#include "gdkdisplay.h"
+
 
 enum {
   DIRECTION_CHANGED,

diff --git a/gdk/gdkkeyuni.c b/gdk/gdkkeyuni.c
index 05ab843c203f01e66b0d88a546372fe1c4f3d2cd..a029044fc3fad702bb739d3751b28c98298dfead 100644 (file)
--- a/gdk/gdkkeyuni.c
+++ b/gdk/gdkkeyuni.c
@@ -25,7 +25,8 @@
  */
 
 #include "config.h"
-#include "gdk.h"
+
+#include "gdktypes.h"
 
 
 /* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode

diff --git a/gdk/gdkmedialib.c b/gdk/gdkmedialib.c
index effb89dd857e59911c6c05157e26744398648028..597726824b5699084f3c23f9f8c972d36c115459 100644 (file)
--- a/gdk/gdkmedialib.c
+++ b/gdk/gdkmedialib.c
@@ -27,6 +27,8 @@
 
 #include "config.h"
 
+#include "gdkmedialib.h"
+
 #include <stdlib.h>
 #include <dlfcn.h>
 
@@ -44,8 +46,6 @@
 #include <sys/sysinfo.h>
 #endif
 
-#include "gdkmedialib.h"
-
 typedef char *      (*ml_version)         (void);
 
 static ml_version                 medialib_version = mlib_version;

diff --git a/gdk/gdkoffscreenwindow.c b/gdk/gdkoffscreenwindow.c
index 55d1fad827157cca082509c9e34a3288090b3f5f..81f3bbc599dd690dc35b67f78842d6216405fc75 100644 (file)
--- a/gdk/gdkoffscreenwindow.c
+++ b/gdk/gdkoffscreenwindow.c
@@ -26,12 +26,11 @@
 
 #include "config.h"
 
-#include <math.h>
-
 #include "gdkwindow.h"
 #include "gdkinternals.h"
 #include "gdkwindowimpl.h"
 
+#include <math.h>
 
 /* LIMITATIONS:
  *

diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index 678b45b9f92228cf24acb86212bb3e381c280a55..20361eada97f1c7b03026dab08e1e2c824da573e 100644 (file)
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -18,12 +18,15 @@
  */
 
 #include "config.h"
-#include <math.h>
-#include <pango/pangocairo.h>
+
 #include "gdkpango.h"
+
 #include "gdkscreen.h"
 #include "gdkintl.h"
 
+#include <math.h>
+#include <pango/pangocairo.h>
+
 /* Get a clip region to draw only part of a layout. index_ranges
  * contains alternating range starts/stops. The region is the
  * region which contains the given ranges, i.e. if you draw with the

diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index 1e2f29fd433a4b6f8bad3b8811b3f4f1a8726a09..a8a5b7e6572c2d93becb30e6a7ecda959ccc6b65 100644 (file)
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -23,13 +23,14 @@
  */
 
 #include "config.h"
-#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "gdkpixbuf.h"
 
 #include "gdkcolor.h"
 #include "gdkwindow.h"
-#include "gdkpixbuf.h"
 #include "gdkinternals.h"
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 /**
  * SECTION:pixbufs

diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c
index 03ce78c743e384bfc692bf2973ee32bd091e9d25..ff68aa53acf9a7ea884a88d72789d1fb873cda04 100644 (file)
--- a/gdk/gdkrectangle.c
+++ b/gdk/gdkrectangle.c
@@ -25,7 +25,8 @@
  */
 
 #include "config.h"
-#include <gdk/gdk.h>
+
+#include "gdkrectangle.h"
 
 
 /**

diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
index c7d6593da6b29e219c2ca6e1afd4c04fd093f39f..25b22d8aef320ab2cb357f97eb39599ab49c548d 100644 (file)
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.c
@@ -22,9 +22,11 @@
  */
 
 #include "config.h"
-#include "gdk.h"               /* For gdk_rectangle_intersect() */
-#include "gdkwindow.h"
+
 #include "gdkscreen.h"
+
+#include "gdkrectangle.h"
+#include "gdkwindow.h"
 #include "gdkintl.h"
 
 

diff --git a/gdk/gdkselection.c b/gdk/gdkselection.c
index e814e30b8317c4b64a6798b5f054c68314febfcc..eed340a02b9ecdf7bd808a910112df28e8b59cf0 100644 (file)
--- a/gdk/gdkselection.c
+++ b/gdk/gdkselection.c
@@ -25,9 +25,11 @@
  */
 
 #include "config.h"
+
+#include "gdkselection.h"
+
 #include "gdkproperty.h"
 #include "gdkdisplay.h"
-#include "gdkselection.h"
 
 
 gboolean

diff --git a/gdk/gdkvisual.c b/gdk/gdkvisual.c
index 2501a09229a3a7cd9a21018c1da9cc1f4e8828ec..ea4c07f268d7b4be5a5372b9e2a83900fa6ce9f8 100644 (file)
--- a/gdk/gdkvisual.c
+++ b/gdk/gdkvisual.c
@@ -22,7 +22,9 @@
  */
 
 #include "config.h"
+
 #include "gdkvisual.h"
+
 #include "gdkscreen.h"
 
 

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index e1e8be62227e9a2a4b4bda3e78a3fa5ec4e12223..9ff1934b390e6d5f57a2b3801c1e7ae9bbd11790 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -34,9 +34,8 @@
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"           /* For workaround */
 #endif
-#include "math.h"
 
-#include "gdk.h"                /* For gdk_rectangle_union() */
+#include "gdkrectangle.h"
 #include "gdkinternals.h"
 #include "gdkintl.h"
 #include "gdkscreen.h"
@@ -46,6 +45,8 @@
 #include "gdkscreen.h"
 #include "gdkwindowimpl.h"
 
+#include <math.h>
+
 #undef DEBUG_WINDOW_PRINTING
 
 

diff --git a/gdk/gdkwindowimpl.c b/gdk/gdkwindowimpl.c
index 2c4df30d51d19c4fa661b43a5656c142e0a70269..5658373b11db63f4c51cd544a85ef1843a981f86 100644 (file)
--- a/gdk/gdkwindowimpl.c
+++ b/gdk/gdkwindowimpl.c
@@ -25,7 +25,9 @@
  */
 
 #include "config.h"
+
 #include "gdkwindowimpl.h"
+
 #include "gdkinternals.h"
 
 

diff --git a/gdk/x11/checksettings.c b/gdk/x11/checksettings.c
index ea6ca3a258dae7257b32290c9b354910247bb0ba..3e05fe89e52256f1be0256b80cb13153c0a88e56 100644 (file)
--- a/gdk/x11/checksettings.c
+++ b/gdk/x11/checksettings.c
@@ -17,8 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <string.h>
+#include "config.h"
+
+#include "gdktypes.h"
+
 #include <glib.h>
+#include <string.h>
+
 #include "gdksettings.c"
 
 int

diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c
index b91b21355e17f46e1b2961c871d2f91ab955d890..df3781edbb13feaa59769b24bc7a322e33ebfaf8 100644 (file)
--- a/gdk/x11/gdkapplaunchcontext-x11.c
+++ b/gdk/x11/gdkapplaunchcontext-x11.c
@@ -22,18 +22,18 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <unistd.h>
-
-#include <glib.h>
-#include <gio/gdesktopappinfo.h>
+#include "gdkapplaunchcontext.h"
 
 #include "gdkx.h"
-#include "gdkapplaunchcontext.h"
 #include "gdkscreen.h"
 #include "gdkinternals.h"
 #include "gdkintl.h"
 
+#include <glib.h>
+#include <gio/gdesktopappinfo.h>
+
+#include <string.h>
+#include <unistd.h>
 
 static char *
 get_display_name (GFile *file)

diff --git a/gdk/x11/gdkasync.c b/gdk/x11/gdkasync.c
index f216c0b1365c493ad282b5b7383c7858a640d5c7..2f591b090695821c2048a5445495e3ceb5d2a30c 100644 (file)
--- a/gdk/x11/gdkasync.c
+++ b/gdk/x11/gdkasync.c
@@ -44,12 +44,15 @@ in this Software without prior written authorization from The Open Group.
 
 */
 #include "config.h"
+
+#include "gdkasync.h"
+#include "gdkx.h"
+
 #ifdef NEED_XIPROTO_H_FOR_XREPLY
 #include <X11/extensions/XIproto.h>
 #endif
+
 #include <X11/Xlibint.h>
-#include "gdkasync.h"
-#include "gdkx.h"
 
 
 typedef struct _ChildInfoChildState ChildInfoChildState;

diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 67ce6d4a02f2941b69b299b491d78c19880ad000..6808c0e0e95eb586065b44e43ba2765c446c78c0 100644 (file)
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -26,7 +26,14 @@
 
 #include "config.h"
 
+#include "gdkcursor.h"
+
+#include "gdkprivate-x11.h"
+#include "gdkdisplay-x11.h"
+#include "gdkx.h"
+
 #define GDK_PIXBUF_ENABLE_BACKEND
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include <X11/Xlib.h>
 #include <X11/cursorfont.h>
@@ -38,11 +45,6 @@
 #endif
 #include <string.h>
 
-#include "gdkprivate-x11.h"
-#include "gdkcursor.h"
-#include "gdkdisplay-x11.h"
-#include "gdkx.h"
-#include <gdk-pixbuf/gdk-pixbuf.h>
 
 static guint theme_serial = 0;
 

diff --git a/gdk/x11/gdkdevice-core.c b/gdk/x11/gdkdevice-core.c
index a947fec73b26bb5dc5290f00127afa8091ac0f15..250ed3be87e54ee90ae5080447e59c87300ba04a 100644 (file)
--- a/gdk/x11/gdkdevice-core.c
+++ b/gdk/x11/gdkdevice-core.c
@@ -19,8 +19,9 @@
 
 #include "config.h"
 
-#include <gdk/gdkwindow.h>
 #include "gdkdevice-core.h"
+
+#include "gdkwindow.h"
 #include "gdkprivate-x11.h"
 #include "gdkx.h"
 

diff --git a/gdk/x11/gdkdevice-xi.c b/gdk/x11/gdkdevice-xi.c
index b82ff18002d091db263b2ec6d7ea8f4c6006a058..7b4f39e44f74d26143916766595dd87d97e77976 100644 (file)
--- a/gdk/x11/gdkdevice-xi.c
+++ b/gdk/x11/gdkdevice-xi.c
@@ -19,9 +19,10 @@
 
 #include "config.h"
 
-#include <gdk/gdkwindow.h>
-#include "gdkdeviceprivate.h"
 #include "gdkdevice-xi.h"
+
+#include "gdkwindow.h"
+#include "gdkdeviceprivate.h"
 #include "gdkprivate-x11.h"
 #include "gdkintl.h"
 #include "gdkx.h"

diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index f64896ca5e33cbc92394780d37ea386b3058f32c..648923a7436099af8c6ab1f05b73d4037f56589f 100644 (file)
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -19,11 +19,12 @@
 
 #include "config.h"
 
-#include <X11/extensions/XInput2.h>
 #include "gdkdevice-xi2.h"
+
 #include "gdkintl.h"
 #include "gdkx.h"
 
+#include <X11/extensions/XInput2.h>
 
 struct _GdkDeviceXI2Private
 {

diff --git a/gdk/x11/gdkdevicemanager-core.c b/gdk/x11/gdkdevicemanager-core.c
index f5af5a0a15021fcd176d40ffc52a3c9cee6a7e0d..e355eec6d7db3fb6154677477fad011be0d11987 100644 (file)
--- a/gdk/x11/gdkdevicemanager-core.c
+++ b/gdk/x11/gdkdevicemanager-core.c
@@ -19,9 +19,10 @@
 
 #include "config.h"
 
-#include <gdk/gdktypes.h>
-#include <gdk/gdkdevicemanager.h>
 #include "gdkdevicemanager-core.h"
+
+#include "gdktypes.h"
+#include "gdkdevicemanager.h"
 #include "gdkeventtranslator.h"
 #include "gdkdevice-core.h"
 #include "gdkkeysyms.h"

diff --git a/gdk/x11/gdkdevicemanager-x11.c b/gdk/x11/gdkdevicemanager-x11.c
index e1cefaa04552e5e936914ed2329a91b46658d49a..a6bb50b7c35bb339912a756ae18e17b76f97dc86 100644 (file)
--- a/gdk/x11/gdkdevicemanager-x11.c
+++ b/gdk/x11/gdkdevicemanager-x11.c
@@ -18,15 +18,15 @@
  */
 
 #include "config.h"
-#include "gdkx.h"
-#include "gdkdevicemanager-core.h"
 
+#include "gdkdevicemanager-core.h"
 #ifdef XINPUT_XFREE
 #include "gdkdevicemanager-xi.h"
 #ifdef XINPUT_2
 #include "gdkdevicemanager-xi2.h"
 #endif
 #endif
+#include "gdkx.h"
 
 GdkDeviceManager *
 _gdk_device_manager_new (GdkDisplay *display)

diff --git a/gdk/x11/gdkdevicemanager-xi.c b/gdk/x11/gdkdevicemanager-xi.c
index 28419b0c140805c60aaeac4584850869c0a0b7dc..52cea6549765a8e2e94fcbab5ba75580adae17aa 100644 (file)
--- a/gdk/x11/gdkdevicemanager-xi.c
+++ b/gdk/x11/gdkdevicemanager-xi.c
@@ -20,6 +20,7 @@
 #include "config.h"
 
 #include "gdkdevicemanager-xi.h"
+
 #include "gdkeventtranslator.h"
 #include "gdkdevice-xi.h"
 #include "gdkintl.h"

diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 00a0869e98d50fe2c803101718bee1e4202ca65a..fd4207419d299cbf4f1e6832017d87278093fb84 100644 (file)
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -19,16 +19,17 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <gdk/gdkdeviceprivate.h>
-
 #include "gdkdevicemanager-xi2.h"
+
+#include <gdk/gdkdeviceprivate.h>
 #include "gdkeventtranslator.h"
 #include "gdkdevice-xi2.h"
 #include "gdkkeysyms.h"
 #include "gdkprivate-x11.h"
 #include "gdkx.h"
 
+#include <string.h>
+
 #define HAS_FOCUS(toplevel) ((toplevel)->has_focus || (toplevel)->has_pointer_focus)
 
 

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index a7213f2fe93bebe78b73c18ff5245dca72f1b3da..083cdf967ea3b320c431c024d8b30d438bcdff88 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -24,17 +24,11 @@
 
 #include "config.h"
 
-#include <glib/gprintf.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
+#include "gdkdisplay-x11.h"
 
-#include <glib.h>
 #include "gdkx.h"
 #include "gdkasync.h"
 #include "gdkdisplay.h"
-#include "gdkdisplay-x11.h"
 #include "gdkeventsource.h"
 #include "gdkeventtranslator.h"
 #include "gdkscreen.h"
@@ -44,6 +38,13 @@
 #include "gdkdevicemanager.h"
 #include "xsettings-client.h"
 
+#include <glib.h>
+#include <glib/gprintf.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+
 #include <X11/Xatom.h>
 
 #ifdef HAVE_XKB

diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 3a889b72e19137e8b521d15b80928ce887001303..74e874b078f9b56bbf2187ce6f3b252e762392fb 100644 (file)
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -26,24 +26,25 @@
 
 #include "config.h"
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/extensions/shape.h>
-#include <X11/extensions/Xcomposite.h>
-
-#include <string.h>
+#include "gdkdnd.h"
 
-#include "gdk.h"          /* For gdk_flush() */
+#include "gdkmain.h"
 #include "gdkx.h"
 #include "gdkasync.h"
-#include "gdkdnd.h"
 #include "gdkproperty.h"
 #include "gdkprivate-x11.h"
 #include "gdkinternals.h"
 #include "gdkscreen-x11.h"
 #include "gdkdisplay-x11.h"
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+#include <X11/extensions/shape.h>
+#include <X11/extensions/Xcomposite.h>
+
+#include <string.h>
+
 typedef struct _GdkDragContextPrivateX11 GdkDragContextPrivateX11;
 
 typedef enum {

diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index 21107166ea3cb541b6217cf3ee004222a2e726fe..a35a54b40e6d9b9856a39827440f0cf09d4572a1 100644 (file)
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -26,17 +26,17 @@
 
 #include "config.h"
 
+#include "gdkdrawable-x11.h"
+
 #include "gdkx.h"
+#include "gdkprivate-x11.h"
+#include "gdkscreen-x11.h"
+#include "gdkdisplay-x11.h"
 
 #include <cairo-xlib.h>
 
 #include <stdlib.h>
-#include <string.h>            /* for memcpy() */
-
-#include "gdkprivate-x11.h"
-#include "gdkdrawable-x11.h"
-#include "gdkscreen-x11.h"
-#include "gdkdisplay-x11.h"
+#include <string.h>
 
 
 static cairo_surface_t *gdk_x11_ref_cairo_surface (GdkDrawable *drawable);

diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c
index 9521b9d20b7f96d55efa6f11ea4f99ca56d8d34a..f3b850e417388db09d63a99b201923e636669679 100644 (file)
--- a/gdk/x11/gdkeventsource.c
+++ b/gdk/x11/gdkeventsource.c
@@ -20,6 +20,7 @@
 #include "config.h"
 
 #include "gdkeventsource.h"
+
 #include "gdkinternals.h"
 #include "gdkx.h"
 

diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c
index 2ec2e08d48ac57e37b7ca23d724f30b69a93576d..a4b706273fc802c387e4e0deb0dd525ce8f8099b 100644 (file)
--- a/gdk/x11/gdkgeometry-x11.c
+++ b/gdk/x11/gdkgeometry-x11.c
@@ -18,7 +18,8 @@
  */
 
 #include "config.h"
-#include "gdk.h"               /* For gdk_rectangle_intersect */
+
+#include "gdkrectangle.h"
 #include "gdkprivate-x11.h"
 #include "gdkx.h"
 #include "gdkinternals.h"

diff --git a/gdk/x11/gdkglobals-x11.c b/gdk/x11/gdkglobals-x11.c
index de9bbccb5ba8509500036d85eb8621b6f05267b8..de616092f0338af0ed613a963a8c48ad0863e734 100644 (file)
--- a/gdk/x11/gdkglobals-x11.c
+++ b/gdk/x11/gdkglobals-x11.c
@@ -25,11 +25,12 @@
  */
 
 #include "config.h"
-#include <stdio.h>
 
 #include "gdktypes.h"
 #include "gdkprivate-x11.h"
 
+#include <stdio.h>
+
 
 gboolean          _gdk_use_xshm = TRUE;  /* used as a cmd line arg */
 GdkAtom           _gdk_selection_property;

diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index 53c7aa673333372ea0b6f7d333845b17214d4dfd..389e653ec006446b92f0f4c65c87baf1a08deb23 100644 (file)
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -26,15 +26,15 @@
 
 #include "config.h"
 
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "gdkx.h"
-#include "gdk.h"               /* For gdk_flush() */
+#include "gdkmain.h"
 #include "gdkinternals.h"
 #include "gdkdisplay-x11.h"
 
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+
 
 /* If this variable is FALSE, it indicates that we should
  * avoid trying to use multibyte conversion functions and

diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index 9c353af392a483db5c3a51ab8b25ce8f079debb2..559caaece40d8b42ad4819e15f1ee2b6e7f68549 100644 (file)
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -26,12 +26,12 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-
 #include "gdkscreen-x11.h"
 #include "gdkdisplay-x11.h"
 #include "gdkwindow.h"
 
+#include <stdlib.h>
+
 
 /* Addition used for extension_events mask */
 #define GDK_ALL_DEVICES_MASK (1<<30)

diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index 831c69f1d4f22ee0a98ae2b18e0c6ac686edecfc..7111c9bf5e8b7ad584f8b2f40fd4420aafbbf660 100644 (file)
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -26,6 +26,12 @@
 
 #include "config.h"
 
+#include "gdkx.h"
+#include "gdkprivate-x11.h"
+#include "gdkinternals.h"
+#include "gdkdisplay-x11.h"
+#include "gdkkeysyms.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -33,14 +39,6 @@
 #include <limits.h>
 #include <errno.h>
 
-#include "gdk.h"
-#include "gdkx.h"
-
-#include "gdkprivate-x11.h"
-#include "gdkinternals.h"
-#include "gdkdisplay-x11.h"
-#include "gdkkeysyms.h"
-
 #ifdef HAVE_XKB
 #include <X11/XKBlib.h>
 

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index d55f66def096d5e710ebaaea439fcd1a8158e2a2..f9df29592fb44ec2f90291e12d5293ac8542315f 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -26,6 +26,14 @@
 
 #include "config.h"
 
+#include "gdkx.h"
+#include "gdkasync.h"
+#include "gdkdisplay-x11.h"
+#include "gdkinternals.h"
+#include "gdkprivate-x11.h"
+#include "gdkintl.h"
+#include "gdkdeviceprivate.h"
+
 #include <glib/gprintf.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,16 +49,6 @@
 #include <X11/XKBlib.h>
 #endif
 
-#include "gdk.h"
-
-#include "gdkx.h"
-#include "gdkasync.h"
-#include "gdkdisplay-x11.h"
-#include "gdkinternals.h"
-#include "gdkprivate-x11.h"
-#include "gdkintl.h"
-
-#include <gdk/gdkdeviceprivate.h>
 
 typedef struct _GdkPredicate        GdkPredicate;
 typedef struct _GdkGlobalErrorTrap  GdkGlobalErrorTrap;

diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 55e114f22550b81d9bf2f2f4b47a5c73404b4df2..4f8d51bea337f2ce8ad0233961cb2a4cb92e6799 100644 (file)
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -25,18 +25,20 @@
  */
 
 #include "config.h"
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#include <string.h>
 
-#include "gdk.h"          /* For gdk_error_trap_push/pop() */
-#include "gdkx.h"
 #include "gdkproperty.h"
+
+#include "gdkmain.h"
+#include "gdkx.h"
 #include "gdkprivate.h"
 #include "gdkinternals.h"
 #include "gdkdisplay-x11.h"
 #include "gdkscreen-x11.h"
-#include "gdkselection.h"      /* only from predefined atom */
+#include "gdkselection.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <string.h>
 
 
 static GPtrArray *virtual_atom_array;

diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index cacb144b9317b7f42bb1aacd55af8375a196ec10..8fb9ffc333b9b6c89ace57788d4e2997bd1b6f99 100644 (file)
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -23,16 +23,18 @@
 
 #include "config.h"
 
-#include <stdlib.h>
-#include <string.h>
+#include "gdkscreen-x11.h"
 
-#include <glib.h>
 #include "gdkscreen.h"
-#include "gdkscreen-x11.h"
 #include "gdkdisplay.h"
 #include "gdkdisplay-x11.h"
 #include "gdkx.h"
 
+#include <glib.h>
+
+#include <stdlib.h>
+#include <string.h>
+
 #include <X11/Xatom.h>
 
 #ifdef HAVE_SOLARIS_XINERAMA

diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index c9b71abeb71d0bece0318241ae49b551dc36217c..6d9e03ac68ffd3226876d075f5dccb09b1805835 100644 (file)
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -25,17 +25,19 @@
  */
 
 #include "config.h"
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#include <string.h>
+
+#include "gdkselection.h"
 
 #include "gdkx.h"
 #include "gdkproperty.h"
-#include "gdkselection.h"
 #include "gdkprivate.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
 
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <string.h>
+
 
 typedef struct _OwnerInfo OwnerInfo;
 

diff --git a/gdk/x11/gdkspawn-x11.c b/gdk/x11/gdkspawn-x11.c
index bee6aa4bf16f61dc283458979cab017dee0685c0..7f97b4e4f015a9af1a126c515352cafa2d5b7ee6 100644 (file)
--- a/gdk/x11/gdkspawn-x11.c
+++ b/gdk/x11/gdkspawn-x11.c
@@ -20,13 +20,12 @@
  */
 
 #include "config.h"
-#include <string.h>
-#include <stdlib.h>
 
 #include "gdkspawn.h"
 
 #include <glib.h>
-#include <gdk/gdk.h>
+#include <string.h>
+#include <stdlib.h>
 
 
 typedef struct {

diff --git a/gdk/x11/gdktestutils-x11.c b/gdk/x11/gdktestutils-x11.c
index 1b782b9d742f0f2494520dd3d6c9da539c6c645e..d4d47fbad7bc7c2f6a29ae15665b6ce45cb970eb 100644 (file)
--- a/gdk/x11/gdktestutils-x11.c
+++ b/gdk/x11/gdktestutils-x11.c
@@ -17,9 +17,13 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include <gdk/gdktestutils.h>
-#include <gdk/gdkkeysyms.h>
-#include <x11/gdkx.h>
+
+#include "config.h"
+
+#include "gdktestutils.h"
+
+#include "gdkkeysyms.h"
+#include "gdkx.h"
 
 #include <X11/Xlib.h>
 

diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index b3fef17731ea55f62be05e38bc3bd7e861cc9b0c..59acba26b0c7ac41eddf7e4c37fe0b08d2c0df27 100644 (file)
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -25,15 +25,17 @@
  */
 
 #include "config.h"
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
 
-#include "gdkx.h"
 #include "gdkvisual.h"
+
+#include "gdkx.h"
 #include "gdkprivate-x11.h"
 #include "gdkscreen-x11.h"
 #include "gdkinternals.h"
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
 struct _GdkVisualPrivate
 {
   Visual *xvisual;

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 66494d6152bc1b3b6d3b111c4e312133bc654a76..68c2b2fbb5c7298797668262b8d71629627feae0 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -27,40 +27,38 @@
 
 #include "config.h"
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-
-#ifdef HAVE_XKB
-#include <X11/XKBlib.h>
-#endif
-
-#include <cairo-xlib.h>
-
-#include <netinet/in.h>
-#include <unistd.h>
+#include "gdkwindow-x11.h"
 
-#include "gdk.h"
 #include "gdkx.h"
-
 #include "gdkwindow.h"
 #include "gdkwindowimpl.h"
 #include "gdkasync.h"
 #include "gdkdisplay-x11.h"
 #include "gdkprivate-x11.h"
 #include "gdkinternals.h"
-#include "MwmUtil.h"
-#include "gdkwindow-x11.h"
 #include "gdkdeviceprivate.h"
 #include "gdkeventsource.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <netinet/in.h>
+#include <unistd.h>
+
+#include <cairo-xlib.h>
+
+#include "MwmUtil.h"
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
 
 #include <X11/extensions/shape.h>
 
+#ifdef HAVE_XKB
+#include <X11/XKBlib.h>
+#endif
+
 #ifdef HAVE_XCOMPOSITE
 #include <X11/extensions/Xcomposite.h>
 #endif

diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c
index c037ee0220bc61c2e680c409b248372abbe5cbe8..0cc99725812fcd6ec8f8104468d7794c8bca86c6 100644 (file)
--- a/gdk/x11/gdkxftdefaults.c
+++ b/gdk/x11/gdkxftdefaults.c
@@ -38,6 +38,9 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c
index 637068c7855b74a5d93d026821d6457b1218ff30..94649b9ae1a755682d1f4b235074e8128711b27d 100644 (file)
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.c
@@ -25,9 +25,11 @@
  */
 
 #include "config.h"
+
 #include "gdkx.h"
 #include "gdkprivate-x11.h"
 #include "gdkdisplay-x11.h"
+
 #include <stdio.h>
 
 static guint     gdk_xid_hash  (XID *xid);

diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c
index 753e461052c73286940086f725f26d3a7c7cc419..67e3b6b02056e6a1b66b45dba53d6cb994969f63 100644 (file)
--- a/gdk/x11/xsettings-client.c
+++ b/gdk/x11/xsettings-client.c
@@ -20,7 +20,11 @@
  *
  * Author:  Owen Taylor, Red Hat, Inc.
  */
+
 #include "config.h"
+
+#include "xsettings-client.h"
+
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,8 +33,6 @@
 #include <X11/Xlib.h>
 #include <X11/Xmd.h>           /* For CARD16 */
 
-#include "xsettings-client.h"
-
 struct _XSettingsClient
 {
   Display *display;

diff --git a/gdk/x11/xsettings-common.c b/gdk/x11/xsettings-common.c
index 1831324fa7d6eca89d12460958003956fde07858..cc3a8d03069ee498de95796f12100ec56ba6cfba 100644 (file)
--- a/gdk/x11/xsettings-common.c
+++ b/gdk/x11/xsettings-common.c
@@ -20,15 +20,17 @@
  *
  * Author:  Owen Taylor, Red Hat, Inc.
  */
+
 #include "config.h"
+
+#include "xsettings-common.h"
+
 #include "string.h"
 #include "stdlib.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xmd.h>           /* For CARD32 */
 
-#include "xsettings-common.h"
-
 XSettingsSetting *
 xsettings_setting_copy (XSettingsSetting *setting)
 {