From bda1f3558504266cde3cb2bbe247dd489bcda941 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 14 Oct 2010 22:05:51 -0400 Subject: [PATCH] Inclusion cleanups in sources Try to do inclusions in the same sequence, more or less. --- gdk/gdk.c | 7 ++++--- gdk/gdkapplaunchcontext.c | 1 + gdk/gdkcairo.c | 5 +++-- gdk/gdkcolor.c | 5 +++-- gdk/gdkcursor.c | 2 ++ gdk/gdkdevice.c | 2 ++ gdk/gdkdevicemanager.c | 2 ++ gdk/gdkdisplay.c | 8 +++++--- gdk/gdkdisplaymanager.c | 5 ++--- gdk/gdkdnd.c | 8 +++++--- gdk/gdkdraw.c | 10 ++++++---- gdk/gdkevents.c | 5 ++--- gdk/gdkglobals.c | 4 ++-- gdk/gdkkeynames.c | 7 ++++--- gdk/gdkkeys.c | 3 ++- gdk/gdkkeyuni.c | 3 ++- gdk/gdkmedialib.c | 4 ++-- gdk/gdkoffscreenwindow.c | 3 +-- gdk/gdkpango.c | 7 +++++-- gdk/gdkpixbuf-drawable.c | 5 +++-- gdk/gdkrectangle.c | 3 ++- gdk/gdkscreen.c | 6 ++++-- gdk/gdkselection.c | 4 +++- gdk/gdkvisual.c | 2 ++ gdk/gdkwindow.c | 5 +++-- gdk/gdkwindowimpl.c | 2 ++ gdk/x11/checksettings.c | 7 ++++++- gdk/x11/gdkapplaunchcontext-x11.c | 12 ++++++------ gdk/x11/gdkasync.c | 7 +++++-- gdk/x11/gdkcursor-x11.c | 12 +++++++----- gdk/x11/gdkdevice-core.c | 3 ++- gdk/x11/gdkdevice-xi.c | 5 +++-- gdk/x11/gdkdevice-xi2.c | 3 ++- gdk/x11/gdkdevicemanager-core.c | 5 +++-- gdk/x11/gdkdevicemanager-x11.c | 4 ++-- gdk/x11/gdkdevicemanager-xi.c | 1 + gdk/x11/gdkdevicemanager-xi2.c | 7 ++++--- gdk/x11/gdkdisplay-x11.c | 15 ++++++++------- gdk/x11/gdkdnd-x11.c | 19 ++++++++++--------- gdk/x11/gdkdrawable-x11.c | 12 ++++++------ gdk/x11/gdkeventsource.c | 1 + gdk/x11/gdkgeometry-x11.c | 3 ++- gdk/x11/gdkglobals-x11.c | 3 ++- gdk/x11/gdkim-x11.c | 10 +++++----- gdk/x11/gdkinput.c | 4 ++-- gdk/x11/gdkkeys-x11.c | 14 ++++++-------- gdk/x11/gdkmain-x11.c | 18 ++++++++---------- gdk/x11/gdkproperty-x11.c | 14 ++++++++------ gdk/x11/gdkscreen-x11.c | 10 ++++++---- gdk/x11/gdkselection-x11.c | 10 ++++++---- gdk/x11/gdkspawn-x11.c | 5 ++--- gdk/x11/gdktestutils-x11.c | 10 +++++++--- gdk/x11/gdkvisual-x11.c | 8 +++++--- gdk/x11/gdkwindow-x11.c | 30 ++++++++++++++---------------- gdk/x11/gdkxftdefaults.c | 3 +++ gdk/x11/gdkxid.c | 2 ++ gdk/x11/xsettings-client.c | 6 ++++-- gdk/x11/xsettings-common.c | 6 ++++-- 58 files changed, 226 insertions(+), 161 deletions(-) diff --git a/gdk/gdk.c b/gdk/gdk.c index 6d5bbc154..ba6582db6 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -26,10 +26,8 @@ #include "config.h" -#include -#include +#include "gdkmain.h" -#include "gdk.h" #include "gdkinternals.h" #include "gdkintl.h" @@ -37,6 +35,9 @@ #include "gdkkeysyms.h" #endif +#include +#include + typedef struct _GdkPredicate GdkPredicate; struct _GdkPredicate diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c index aa37ca7fc..46fd99a4f 100644 --- 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 ee7561ab3..5e711b6ab 100644 --- a/gdk/gdkcairo.c +++ b/gdk/gdkcairo.c @@ -17,13 +17,14 @@ * Boston, MA 02111-1307, USA. */ -#include "gdkcairo.h" +#include "config.h" -#include +#include "gdkcairo.h" #include "gdkdrawable.h" #include "gdkinternals.h" +#include /** * SECTION:cairo_interaction diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c index 125739903..d4ab63cb2 100644 --- a/gdk/gdkcolor.c +++ b/gdk/gdkcolor.c @@ -25,12 +25,13 @@ */ #include "config.h" -#include -#include "gdkscreen.h" #include "gdkcolor.h" + +#include "gdkscreen.h" #include "gdkinternals.h" +#include /** * SECTION:colors diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c index dbed4f2e1..0aabd5940 100644 --- 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 4c9421726..aaf498993 100644 --- 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 8f1457b62..2edaa2870 100644 --- 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 39ccd25db..2f3050965 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -22,15 +22,17 @@ */ #include "config.h" -#include -#include -#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 +#include enum { OPENED, diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c index 93a632eec..5da2c0218 100644 --- 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 49b9d04cf..cccae0968 100644 --- a/gdk/gdkdnd.c +++ b/gdk/gdkdnd.c @@ -25,9 +25,11 @@ */ #include "config.h" -#include -#include -#include + +#include "gdkdnd.h" + +#include "gdkdisplay.h" +#include "gdkwindow.h" /** diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c index 2c5c4e263..d31dfd9a6 100644 --- a/gdk/gdkdraw.c +++ b/gdk/gdkdraw.c @@ -25,16 +25,18 @@ */ #include "config.h" -#include -#include -#include -#include "gdkcairo.h" + #include "gdkdrawable.h" + +#include "gdkcairo.h" #include "gdkinternals.h" #include "gdkwindow.h" #include "gdkscreen.h" #include "gdkpixbuf.h" +#include +#include +#include G_DEFINE_ABSTRACT_TYPE (GdkDrawable, gdk_drawable, G_TYPE_OBJECT) diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index f44a658f0..7fd197ec0 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -25,12 +25,11 @@ */ #include "config.h" -#include /* For memset() */ -#include -#include "gdk.h" #include "gdkinternals.h" +#include +#include typedef struct _GdkIOClosure GdkIOClosure; diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c index fc7349587..541388669 100644 --- a/gdk/gdkglobals.c +++ b/gdk/gdkglobals.c @@ -26,11 +26,11 @@ #include "config.h" -#include - #include "gdktypes.h" #include "gdkprivate.h" +#include + guint _gdk_debug_flags = 0; GList *_gdk_default_filters = NULL; diff --git a/gdk/gdkkeynames.c b/gdk/gdkkeynames.c index 0e5ad1af5..bbebc3b26 100644 --- a/gdk/gdkkeynames.c +++ b/gdk/gdkkeynames.c @@ -25,9 +25,6 @@ */ #include "config.h" -#include -#include -#include #include "gdkkeysyms.h" #include "gdkinternals.h" @@ -36,6 +33,10 @@ #include "keyname-table.h" +#include +#include +#include + #define GDK_NUM_KEYS G_N_ELEMENTS (gdk_keys_by_keyval) static int diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c index b8fb27a5d..872576f6d 100644 --- 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 05ab843c2..a029044fc 100644 --- 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 for the ksysym<->Unicode diff --git a/gdk/gdkmedialib.c b/gdk/gdkmedialib.c index effb89dd8..597726824 100644 --- a/gdk/gdkmedialib.c +++ b/gdk/gdkmedialib.c @@ -27,6 +27,8 @@ #include "config.h" +#include "gdkmedialib.h" + #include #include @@ -44,8 +46,6 @@ #include #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 55d1fad82..81f3bbc59 100644 --- a/gdk/gdkoffscreenwindow.c +++ b/gdk/gdkoffscreenwindow.c @@ -26,12 +26,11 @@ #include "config.h" -#include - #include "gdkwindow.h" #include "gdkinternals.h" #include "gdkwindowimpl.h" +#include /* LIMITATIONS: * diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c index 678b45b9f..20361eada 100644 --- a/gdk/gdkpango.c +++ b/gdk/gdkpango.c @@ -18,12 +18,15 @@ */ #include "config.h" -#include -#include + #include "gdkpango.h" + #include "gdkscreen.h" #include "gdkintl.h" +#include +#include + /* 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 1e2f29fd4..a8a5b7e65 100644 --- a/gdk/gdkpixbuf-drawable.c +++ b/gdk/gdkpixbuf-drawable.c @@ -23,13 +23,14 @@ */ #include "config.h" -#include + +#include "gdkpixbuf.h" #include "gdkcolor.h" #include "gdkwindow.h" -#include "gdkpixbuf.h" #include "gdkinternals.h" +#include /** * SECTION:pixbufs diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c index 03ce78c74..ff68aa53a 100644 --- a/gdk/gdkrectangle.c +++ b/gdk/gdkrectangle.c @@ -25,7 +25,8 @@ */ #include "config.h" -#include + +#include "gdkrectangle.h" /** diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c index c7d6593da..25b22d8ae 100644 --- 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 e814e30b8..eed340a02 100644 --- 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 2501a0922..ea4c07f26 100644 --- 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 e1e8be622..9ff1934b3 100644 --- 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 + #undef DEBUG_WINDOW_PRINTING diff --git a/gdk/gdkwindowimpl.c b/gdk/gdkwindowimpl.c index 2c4df30d5..5658373b1 100644 --- 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 ea6ca3a25..3e05fe89e 100644 --- a/gdk/x11/checksettings.c +++ b/gdk/x11/checksettings.c @@ -17,8 +17,13 @@ * Boston, MA 02111-1307, USA. */ -#include +#include "config.h" + +#include "gdktypes.h" + #include +#include + #include "gdksettings.c" int diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c index b91b21355..df3781edb 100644 --- a/gdk/x11/gdkapplaunchcontext-x11.c +++ b/gdk/x11/gdkapplaunchcontext-x11.c @@ -22,18 +22,18 @@ #include "config.h" -#include -#include - -#include -#include +#include "gdkapplaunchcontext.h" #include "gdkx.h" -#include "gdkapplaunchcontext.h" #include "gdkscreen.h" #include "gdkinternals.h" #include "gdkintl.h" +#include +#include + +#include +#include static char * get_display_name (GFile *file) diff --git a/gdk/x11/gdkasync.c b/gdk/x11/gdkasync.c index f216c0b13..2f591b090 100644 --- 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 #endif + #include -#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 67ce6d4a0..6808c0e0e 100644 --- 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 #include #include @@ -38,11 +45,6 @@ #endif #include -#include "gdkprivate-x11.h" -#include "gdkcursor.h" -#include "gdkdisplay-x11.h" -#include "gdkx.h" -#include static guint theme_serial = 0; diff --git a/gdk/x11/gdkdevice-core.c b/gdk/x11/gdkdevice-core.c index a947fec73..250ed3be8 100644 --- a/gdk/x11/gdkdevice-core.c +++ b/gdk/x11/gdkdevice-core.c @@ -19,8 +19,9 @@ #include "config.h" -#include #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 b82ff1800..7b4f39e44 100644 --- a/gdk/x11/gdkdevice-xi.c +++ b/gdk/x11/gdkdevice-xi.c @@ -19,9 +19,10 @@ #include "config.h" -#include -#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 f64896ca5..648923a74 100644 --- a/gdk/x11/gdkdevice-xi2.c +++ b/gdk/x11/gdkdevice-xi2.c @@ -19,11 +19,12 @@ #include "config.h" -#include #include "gdkdevice-xi2.h" + #include "gdkintl.h" #include "gdkx.h" +#include struct _GdkDeviceXI2Private { diff --git a/gdk/x11/gdkdevicemanager-core.c b/gdk/x11/gdkdevicemanager-core.c index f5af5a0a1..e355eec6d 100644 --- a/gdk/x11/gdkdevicemanager-core.c +++ b/gdk/x11/gdkdevicemanager-core.c @@ -19,9 +19,10 @@ #include "config.h" -#include -#include #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 e1cefaa04..a6bb50b7c 100644 --- 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 28419b0c1..52cea6549 100644 --- 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 00a0869e9..fd4207419 100644 --- a/gdk/x11/gdkdevicemanager-xi2.c +++ b/gdk/x11/gdkdevicemanager-xi2.c @@ -19,16 +19,17 @@ #include "config.h" -#include -#include - #include "gdkdevicemanager-xi2.h" + +#include #include "gdkeventtranslator.h" #include "gdkdevice-xi2.h" #include "gdkkeysyms.h" #include "gdkprivate-x11.h" #include "gdkx.h" +#include + #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 a7213f2fe..083cdf967 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -24,17 +24,11 @@ #include "config.h" -#include -#include -#include -#include -#include +#include "gdkdisplay-x11.h" -#include #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 +#include +#include +#include +#include +#include + #include #ifdef HAVE_XKB diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 3a889b72e..74e874b07 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -26,24 +26,25 @@ #include "config.h" -#include -#include -#include -#include -#include - -#include +#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 +#include +#include +#include +#include + +#include + typedef struct _GdkDragContextPrivateX11 GdkDragContextPrivateX11; typedef enum { diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c index 21107166e..a35a54b40 100644 --- 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 #include -#include /* for memcpy() */ - -#include "gdkprivate-x11.h" -#include "gdkdrawable-x11.h" -#include "gdkscreen-x11.h" -#include "gdkdisplay-x11.h" +#include static cairo_surface_t *gdk_x11_ref_cairo_surface (GdkDrawable *drawable); diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c index 9521b9d20..f3b850e41 100644 --- 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 2ec2e08d4..a4b706273 100644 --- 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 de9bbccb5..de616092f 100644 --- a/gdk/x11/gdkglobals-x11.c +++ b/gdk/x11/gdkglobals-x11.c @@ -25,11 +25,12 @@ */ #include "config.h" -#include #include "gdktypes.h" #include "gdkprivate-x11.h" +#include + 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 53c7aa673..389e653ec 100644 --- a/gdk/x11/gdkim-x11.c +++ b/gdk/x11/gdkim-x11.c @@ -26,15 +26,15 @@ #include "config.h" -#include -#include -#include - #include "gdkx.h" -#include "gdk.h" /* For gdk_flush() */ +#include "gdkmain.h" #include "gdkinternals.h" #include "gdkdisplay-x11.h" +#include +#include +#include + /* 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 9c353af39..559caaece 100644 --- a/gdk/x11/gdkinput.c +++ b/gdk/x11/gdkinput.c @@ -26,12 +26,12 @@ #include "config.h" -#include - #include "gdkscreen-x11.h" #include "gdkdisplay-x11.h" #include "gdkwindow.h" +#include + /* 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 831c69f1d..7111c9bf5 100644 --- 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 #include #include @@ -33,14 +39,6 @@ #include #include -#include "gdk.h" -#include "gdkx.h" - -#include "gdkprivate-x11.h" -#include "gdkinternals.h" -#include "gdkdisplay-x11.h" -#include "gdkkeysyms.h" - #ifdef HAVE_XKB #include diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index d55f66def..f9df29592 100644 --- 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 #include #include @@ -41,16 +49,6 @@ #include #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 typedef struct _GdkPredicate GdkPredicate; typedef struct _GdkGlobalErrorTrap GdkGlobalErrorTrap; diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c index 55e114f22..4f8d51bea 100644 --- a/gdk/x11/gdkproperty-x11.c +++ b/gdk/x11/gdkproperty-x11.c @@ -25,18 +25,20 @@ */ #include "config.h" -#include -#include -#include -#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 +#include +#include static GPtrArray *virtual_atom_array; diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index cacb144b9..8fb9ffc33 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -23,16 +23,18 @@ #include "config.h" -#include -#include +#include "gdkscreen-x11.h" -#include #include "gdkscreen.h" -#include "gdkscreen-x11.h" #include "gdkdisplay.h" #include "gdkdisplay-x11.h" #include "gdkx.h" +#include + +#include +#include + #include #ifdef HAVE_SOLARIS_XINERAMA diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c index c9b71abeb..6d9e03ac6 100644 --- a/gdk/x11/gdkselection-x11.c +++ b/gdk/x11/gdkselection-x11.c @@ -25,17 +25,19 @@ */ #include "config.h" -#include -#include -#include + +#include "gdkselection.h" #include "gdkx.h" #include "gdkproperty.h" -#include "gdkselection.h" #include "gdkprivate.h" #include "gdkprivate-x11.h" #include "gdkdisplay-x11.h" +#include +#include +#include + typedef struct _OwnerInfo OwnerInfo; diff --git a/gdk/x11/gdkspawn-x11.c b/gdk/x11/gdkspawn-x11.c index bee6aa4bf..7f97b4e4f 100644 --- a/gdk/x11/gdkspawn-x11.c +++ b/gdk/x11/gdkspawn-x11.c @@ -20,13 +20,12 @@ */ #include "config.h" -#include -#include #include "gdkspawn.h" #include -#include +#include +#include typedef struct { diff --git a/gdk/x11/gdktestutils-x11.c b/gdk/x11/gdktestutils-x11.c index 1b782b9d7..d4d47fbad 100644 --- 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 -#include -#include + +#include "config.h" + +#include "gdktestutils.h" + +#include "gdkkeysyms.h" +#include "gdkx.h" #include diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c index b3fef1773..59acba26b 100644 --- a/gdk/x11/gdkvisual-x11.c +++ b/gdk/x11/gdkvisual-x11.c @@ -25,15 +25,17 @@ */ #include "config.h" -#include -#include -#include "gdkx.h" #include "gdkvisual.h" + +#include "gdkx.h" #include "gdkprivate-x11.h" #include "gdkscreen-x11.h" #include "gdkinternals.h" +#include +#include + struct _GdkVisualPrivate { Visual *xvisual; diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 66494d615..68c2b2fbb 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -27,40 +27,38 @@ #include "config.h" -#include -#include -#include - -#ifdef HAVE_XKB -#include -#endif - -#include - -#include -#include +#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 #include #include +#include +#include + +#include + +#include "MwmUtil.h" +#include +#include +#include #include +#ifdef HAVE_XKB +#include +#endif + #ifdef HAVE_XCOMPOSITE #include #endif diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c index c037ee022..0cc997258 100644 --- 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 #include diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c index 637068c78..94649b9ae 100644 --- 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 static guint gdk_xid_hash (XID *xid); diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c index 753e46105..67e3b6b02 100644 --- 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 #include #include @@ -29,8 +33,6 @@ #include #include /* 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 1831324fa..cc3a8d030 100644 --- 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 #include /* For CARD32 */ -#include "xsettings-common.h" - XSettingsSetting * xsettings_setting_copy (XSettingsSetting *setting) { -- 2.43.2