Commit bda1f355 authored by Matthias Clasen's avatar Matthias Clasen

Inclusion cleanups in sources

Try to do inclusions in the same sequence, more or less.
parent 88ef199e
...@@ -26,10 +26,8 @@ ...@@ -26,10 +26,8 @@
#include "config.h" #include "config.h"
#include <string.h> #include "gdkmain.h"
#include <stdlib.h>
#include "gdk.h"
#include "gdkinternals.h" #include "gdkinternals.h"
#include "gdkintl.h" #include "gdkintl.h"
...@@ -37,6 +35,9 @@ ...@@ -37,6 +35,9 @@
#include "gdkkeysyms.h" #include "gdkkeysyms.h"
#endif #endif
#include <string.h>
#include <stdlib.h>
typedef struct _GdkPredicate GdkPredicate; typedef struct _GdkPredicate GdkPredicate;
struct _GdkPredicate struct _GdkPredicate
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "config.h" #include "config.h"
#include "gdkapplaunchcontext.h" #include "gdkapplaunchcontext.h"
#include "gdkinternals.h" #include "gdkinternals.h"
#include "gdkscreen.h" #include "gdkscreen.h"
#include "gdkintl.h" #include "gdkintl.h"
......
...@@ -17,13 +17,14 @@ ...@@ -17,13 +17,14 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include "gdkcairo.h" #include "config.h"
#include <math.h> #include "gdkcairo.h"
#include "gdkdrawable.h" #include "gdkdrawable.h"
#include "gdkinternals.h" #include "gdkinternals.h"
#include <math.h>
/** /**
* SECTION:cairo_interaction * SECTION:cairo_interaction
......
...@@ -25,12 +25,13 @@ ...@@ -25,12 +25,13 @@
*/ */
#include "config.h" #include "config.h"
#include <time.h>
#include "gdkscreen.h"
#include "gdkcolor.h" #include "gdkcolor.h"
#include "gdkscreen.h"
#include "gdkinternals.h" #include "gdkinternals.h"
#include <time.h>
/** /**
* SECTION:colors * SECTION:colors
......
...@@ -25,7 +25,9 @@ ...@@ -25,7 +25,9 @@
*/ */
#include "config.h" #include "config.h"
#include "gdkcursor.h" #include "gdkcursor.h"
#include "gdkdisplay.h" #include "gdkdisplay.h"
#include "gdkinternals.h" #include "gdkinternals.h"
......
...@@ -18,7 +18,9 @@ ...@@ -18,7 +18,9 @@
*/ */
#include "config.h" #include "config.h"
#include "gdkdevice.h" #include "gdkdevice.h"
#include "gdkdeviceprivate.h" #include "gdkdeviceprivate.h"
#include "gdkintl.h" #include "gdkintl.h"
#include "gdkinternals.h" #include "gdkinternals.h"
......
...@@ -18,7 +18,9 @@ ...@@ -18,7 +18,9 @@
*/ */
#include "config.h" #include "config.h"
#include "gdkdevicemanager.h" #include "gdkdevicemanager.h"
#include "gdkintl.h" #include "gdkintl.h"
#include "gdkinternals.h" #include "gdkinternals.h"
......
...@@ -22,15 +22,17 @@ ...@@ -22,15 +22,17 @@
*/ */
#include "config.h" #include "config.h"
#include <math.h>
#include <glib.h>
#include "gdk.h" /* gdk_event_send_client_message() */
#include "gdkdisplay.h" #include "gdkdisplay.h"
#include "gdkevents.h"
#include "gdkwindowimpl.h" #include "gdkwindowimpl.h"
#include "gdkinternals.h" #include "gdkinternals.h"
#include "gdkmarshalers.h" #include "gdkmarshalers.h"
#include "gdkscreen.h" #include "gdkscreen.h"
#include <glib.h>
#include <math.h>
enum { enum {
OPENED, OPENED,
......
...@@ -26,13 +26,12 @@ ...@@ -26,13 +26,12 @@
#include "config.h" #include "config.h"
#include "gdkscreen.h"
#include "gdkdisplay.h"
#include "gdkdisplaymanager.h" #include "gdkdisplaymanager.h"
#include "gdkscreen.h"
#include "gdkdisplay.h"
#include "gdkinternals.h" #include "gdkinternals.h"
#include "gdkmarshalers.h" #include "gdkmarshalers.h"
#include "gdkintl.h" #include "gdkintl.h"
......
...@@ -25,9 +25,11 @@ ...@@ -25,9 +25,11 @@
*/ */
#include "config.h" #include "config.h"
#include <gdkdnd.h>
#include <gdkdisplay.h> #include "gdkdnd.h"
#include <gdkwindow.h>
#include "gdkdisplay.h"
#include "gdkwindow.h"
/** /**
......
...@@ -25,16 +25,18 @@ ...@@ -25,16 +25,18 @@
*/ */
#include "config.h" #include "config.h"
#include <math.h>
#include <pango/pangocairo.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "gdkcairo.h"
#include "gdkdrawable.h" #include "gdkdrawable.h"
#include "gdkcairo.h"
#include "gdkinternals.h" #include "gdkinternals.h"
#include "gdkwindow.h" #include "gdkwindow.h"
#include "gdkscreen.h" #include "gdkscreen.h"
#include "gdkpixbuf.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) G_DEFINE_ABSTRACT_TYPE (GdkDrawable, gdk_drawable, G_TYPE_OBJECT)
......
...@@ -25,12 +25,11 @@ ...@@ -25,12 +25,11 @@
*/ */
#include "config.h" #include "config.h"
#include <string.h> /* For memset() */
#include <math.h>
#include "gdk.h"
#include "gdkinternals.h" #include "gdkinternals.h"
#include <string.h>
#include <math.h>
typedef struct _GdkIOClosure GdkIOClosure; typedef struct _GdkIOClosure GdkIOClosure;
......
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
#include "config.h" #include "config.h"
#include <stdio.h>
#include "gdktypes.h" #include "gdktypes.h"
#include "gdkprivate.h" #include "gdkprivate.h"
#include <stdio.h>
guint _gdk_debug_flags = 0; guint _gdk_debug_flags = 0;
GList *_gdk_default_filters = NULL; GList *_gdk_default_filters = NULL;
......
...@@ -25,9 +25,6 @@ ...@@ -25,9 +25,6 @@
*/ */
#include "config.h" #include "config.h"
#include <glib/gprintf.h>
#include <stdlib.h>
#include <string.h>
#include "gdkkeysyms.h" #include "gdkkeysyms.h"
#include "gdkinternals.h" #include "gdkinternals.h"
...@@ -36,6 +33,10 @@ ...@@ -36,6 +33,10 @@
#include "keyname-table.h" #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) #define GDK_NUM_KEYS G_N_ELEMENTS (gdk_keys_by_keyval)
static int static int
......
...@@ -26,9 +26,10 @@ ...@@ -26,9 +26,10 @@
#include "config.h" #include "config.h"
#include "gdkdisplay.h"
#include "gdkkeys.h" #include "gdkkeys.h"
#include "gdkdisplay.h"
enum { enum {
DIRECTION_CHANGED, DIRECTION_CHANGED,
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
*/ */
#include "config.h" #include "config.h"
#include "gdk.h"
#include "gdktypes.h"
/* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode /* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode
......
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#include "config.h" #include "config.h"
#include "gdkmedialib.h"
#include <stdlib.h> #include <stdlib.h>
#include <dlfcn.h> #include <dlfcn.h>
...@@ -44,8 +46,6 @@ ...@@ -44,8 +46,6 @@
#include <sys/sysinfo.h> #include <sys/sysinfo.h>
#endif #endif
#include "gdkmedialib.h"
typedef char * (*ml_version) (void); typedef char * (*ml_version) (void);
static ml_version medialib_version = mlib_version; static ml_version medialib_version = mlib_version;
......
...@@ -26,12 +26,11 @@ ...@@ -26,12 +26,11 @@
#include "config.h" #include "config.h"
#include <math.h>
#include "gdkwindow.h" #include "gdkwindow.h"
#include "gdkinternals.h" #include "gdkinternals.h"
#include "gdkwindowimpl.h" #include "gdkwindowimpl.h"
#include <math.h>
/* LIMITATIONS: /* LIMITATIONS:
* *
......
...@@ -18,12 +18,15 @@ ...@@ -18,12 +18,15 @@
*/ */
#include "config.h" #include "config.h"
#include <math.h>
#include <pango/pangocairo.h>
#include "gdkpango.h" #include "gdkpango.h"
#include "gdkscreen.h" #include "gdkscreen.h"
#include "gdkintl.h" #include "gdkintl.h"
#include <math.h>
#include <pango/pangocairo.h>
/* Get a clip region to draw only part of a layout. index_ranges /* Get a clip region to draw only part of a layout. index_ranges
* contains alternating range starts/stops. The region is the * contains alternating range starts/stops. The region is the
* region which contains the given ranges, i.e. if you draw with the * region which contains the given ranges, i.e. if you draw with the
......
...@@ -23,13 +23,14 @@ ...@@ -23,13 +23,14 @@
*/ */
#include "config.h" #include "config.h"
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "gdkpixbuf.h"
#include "gdkcolor.h" #include "gdkcolor.h"
#include "gdkwindow.h" #include "gdkwindow.h"
#include "gdkpixbuf.h"
#include "gdkinternals.h" #include "gdkinternals.h"
#include <gdk-pixbuf/gdk-pixbuf.h>
/** /**
* SECTION:pixbufs * SECTION:pixbufs
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
*/ */
#include "config.h" #include "config.h"
#include <gdk/gdk.h>
#include "gdkrectangle.h"
/** /**
......
...@@ -22,9 +22,11 @@ ...@@ -22,9 +22,11 @@
*/ */
#include "config.h" #include "config.h"
#include "gdk.h" /* For gdk_rectangle_intersect() */
#include "gdkwindow.h"
#include "gdkscreen.h" #include "gdkscreen.h"
#include "gdkrectangle.h"
#include "gdkwindow.h"
#include "gdkintl.h" #include "gdkintl.h"
......
...@@ -25,9 +25,11 @@ ...@@ -25,9 +25,11 @@
*/ */
#include "config.h" #include "config.h"
#include "gdkselection.h"
#include "gdkproperty.h" #include "gdkproperty.h"
#include "gdkdisplay.h" #include "gdkdisplay.h"
#include "gdkselection.h"
gboolean gboolean
......
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
*/ */
#include "config.h" #include "config.h"
#include "gdkvisual.h" #include "gdkvisual.h"
#include "gdkscreen.h" #include "gdkscreen.h"
......
...@@ -34,9 +34,8 @@ ...@@ -34,9 +34,8 @@
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include "x11/gdkx.h" /* For workaround */ #include "x11/gdkx.h" /* For workaround */
#endif #endif
#include "math.h"
#include "gdk.h" /* For gdk_rectangle_union() */ #include "gdkrectangle.h"
#include "gdkinternals.h" #include "gdkinternals.h"
#include "gdkintl.h" #include "gdkintl.h"
#include "gdkscreen.h" #include "gdkscreen.h"
...@@ -46,6 +45,8 @@ ...@@ -46,6 +45,8 @@
#include "gdkscreen.h" #include "gdkscreen.h"
#include "gdkwindowimpl.h" #include "gdkwindowimpl.h"
#include <math.h>
#undef DEBUG_WINDOW_PRINTING #undef DEBUG_WINDOW_PRINTING
......
...@@ -25,7 +25,9 @@ ...@@ -25,7 +25,9 @@
*/ */
#include "config.h" #include "config.h"
#include "gdkwindowimpl.h" #include "gdkwindowimpl.h"
#include "gdkinternals.h" #include "gdkinternals.h"
......
...@@ -17,8 +17,13 @@ ...@@ -17,8 +17,13 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include <string.h> #include "config.h"
#include "gdktypes.h"
#include <glib.h> #include <glib.h>
#include <string.h>
#include "gdksettings.c" #include "gdksettings.c"
int int
......
...@@ -22,18 +22,18 @@ ...@@ -22,18 +22,18 @@
#include "config.h" #include "config.h"
#include <string.h> #include "gdkapplaunchcontext.h"
#include <unistd.h>
#include <glib.h>
#include <gio/gdesktopappinfo.h>
#include "gdkx.h" #include "gdkx.h"
#include "gdkapplaunchcontext.h"
#include "gdkscreen.h" #include "gdkscreen.h"
#include "gdkinternals.h" #include "gdkinternals.h"
#include "gdkintl.h" #include "gdkintl.h"
#include <glib.h>
#include <gio/gdesktopappinfo.h>