summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@ximian.com>2004-03-06 03:38:59 +0000
committerFederico Mena Quintero <federico@src.gnome.org>2004-03-06 03:38:59 +0000
commit80581c3011871fa000433a881554ffc1e9363468 (patch)
tree8b528a2413d95ba1c4831b7bf02a5b583924e438 /gdk
parent7d94c90fca82c3543c5f860fc5e57cf36a966db8 (diff)
downloadgtk+-80581c3011871fa000433a881554ffc1e9363468.tar.gz
Fixes #136082 and #135265, patch by Morten Welinder.
2004-03-05 Federico Mena Quintero <federico@ximian.com> Fixes #136082 and #135265, patch by Morten Welinder. * configure.in: Use AC_SYS_LARGEFILE. * */*.c: #include <config.h>
Diffstat (limited to 'gdk')
-rw-r--r--gdk/gdk.c2
-rw-r--r--gdk/gdkcolor.c1
-rw-r--r--gdk/gdkcursor.c1
-rw-r--r--gdk/gdkdisplay.c1
-rw-r--r--gdk/gdkdnd.c1
-rw-r--r--gdk/gdkdraw.c1
-rw-r--r--gdk/gdkevents.c1
-rw-r--r--gdk/gdkfont.c1
-rw-r--r--gdk/gdkgc.c1
-rw-r--r--gdk/gdkglobals.c3
-rw-r--r--gdk/gdkimage.c1
-rw-r--r--gdk/gdkkeynames.c1
-rw-r--r--gdk/gdkkeyuni.c1
-rw-r--r--gdk/gdkpango.c1
-rw-r--r--gdk/gdkpixmap.c1
-rw-r--r--gdk/gdkpolyreg-generic.c1
-rw-r--r--gdk/gdkrectangle.c1
-rw-r--r--gdk/gdkregion-generic.c1
-rw-r--r--gdk/gdkrgb.c17
-rw-r--r--gdk/gdkscreen.c1
-rw-r--r--gdk/gdkselection.c1
-rw-r--r--gdk/gdkvisual.c1
-rw-r--r--gdk/gdkwindow.c1
-rw-r--r--gdk/linux-fb/gdkcolor-fb.c1
-rw-r--r--gdk/linux-fb/gdkcursor-fb.c1
-rw-r--r--gdk/linux-fb/gdkdisplay-fb.c1
-rw-r--r--gdk/linux-fb/gdkdnd-fb.c1
-rw-r--r--gdk/linux-fb/gdkdrawable-fb2.c2
-rw-r--r--gdk/linux-fb/gdkevents-fb.c1
-rw-r--r--gdk/linux-fb/gdkfbmanager.c1
-rw-r--r--gdk/linux-fb/gdkfbswitch.c1
-rw-r--r--gdk/linux-fb/gdkfont-fb.c1
-rw-r--r--gdk/linux-fb/gdkgc-fb.c1
-rw-r--r--gdk/linux-fb/gdkgeometry-fb.c1
-rw-r--r--gdk/linux-fb/gdkglobals-fb.c2
-rw-r--r--gdk/linux-fb/gdkinput-none.c1
-rw-r--r--gdk/linux-fb/gdkinput.c2
-rw-r--r--gdk/linux-fb/gdkkeyboard-fb.c1
-rw-r--r--gdk/linux-fb/gdkmain-fb.c2
-rw-r--r--gdk/linux-fb/gdkmouse-fb.c1
-rw-r--r--gdk/linux-fb/gdkpango-fb.c1
-rw-r--r--gdk/linux-fb/gdkpixmap-fb.c2
-rw-r--r--gdk/linux-fb/gdkproperty-fb.c1
-rw-r--r--gdk/linux-fb/gdkrender-fb.c2
-rw-r--r--gdk/linux-fb/gdkscreen-fb.c1
-rw-r--r--gdk/linux-fb/gdkselection-fb.c1
-rw-r--r--gdk/linux-fb/gdkvisual-fb.c1
-rw-r--r--gdk/linux-fb/gdkwindow-fb.c2
-rw-r--r--gdk/linux-fb/miarc.c1
-rw-r--r--gdk/linux-fb/midash.c1
-rw-r--r--gdk/linux-fb/mifillarc.c1
-rw-r--r--gdk/linux-fb/mifpolycon.c1
-rw-r--r--gdk/linux-fb/mipoly.c1
-rw-r--r--gdk/linux-fb/mipolygen.c1
-rw-r--r--gdk/linux-fb/mipolyutil.c1
-rw-r--r--gdk/linux-fb/mispans.c1
-rw-r--r--gdk/linux-fb/miwideline.c1
-rw-r--r--gdk/linux-fb/mizerclip.c1
-rw-r--r--gdk/linux-fb/mizerline.c1
-rw-r--r--gdk/testgdk.c1
-rw-r--r--gdk/win32/bdfcursor.c1
-rw-r--r--gdk/win32/gdkcolor-win32.c1
-rw-r--r--gdk/win32/gdkcursor-win32.c1
-rw-r--r--gdk/win32/gdkdisplay-win32.c1
-rw-r--r--gdk/win32/gdkdnd-win32.c1
-rw-r--r--gdk/win32/gdkdrawable-win32.c1
-rw-r--r--gdk/win32/gdkevents-win32.c2
-rw-r--r--gdk/win32/gdkfont-win32.c1
-rw-r--r--gdk/win32/gdkgc-win32.c1
-rw-r--r--gdk/win32/gdkgeometry-win32.c1
-rw-r--r--gdk/win32/gdkglobals-win32.c1
-rw-r--r--gdk/win32/gdkimage-win32.c1
-rw-r--r--gdk/win32/gdkinput-win32.c2
-rw-r--r--gdk/win32/gdkinput.c2
-rw-r--r--gdk/win32/gdkkeys-win32.c2
-rw-r--r--gdk/win32/gdkmain-win32.c2
-rw-r--r--gdk/win32/gdkpango-win32.c1
-rw-r--r--gdk/win32/gdkpixmap-win32.c1
-rw-r--r--gdk/win32/gdkproperty-win32.c1
-rw-r--r--gdk/win32/gdkscreen-win32.c1
-rw-r--r--gdk/win32/gdkselection-win32.c1
-rw-r--r--gdk/win32/gdkvisual-win32.c1
-rw-r--r--gdk/win32/gdkwin32id.c1
-rw-r--r--gdk/win32/gdkwindow-win32.c1
-rw-r--r--gdk/x11/gdkasync.c1
-rw-r--r--gdk/x11/gdkcolor-x11.c1
-rw-r--r--gdk/x11/gdkcursor-x11.c2
-rw-r--r--gdk/x11/gdkdnd-x11.c1
-rw-r--r--gdk/x11/gdkdrawable-x11.c4
-rw-r--r--gdk/x11/gdkevents-x11.c9
-rw-r--r--gdk/x11/gdkfont-x11.c1
-rw-r--r--gdk/x11/gdkgeometry-x11.c1
-rw-r--r--gdk/x11/gdkglobals-x11.c1
-rw-r--r--gdk/x11/gdkim-x11.c10
-rw-r--r--gdk/x11/gdkinput-none.c1
-rw-r--r--gdk/x11/gdkinput-x11.c1
-rw-r--r--gdk/x11/gdkinput-xfree.c1
-rw-r--r--gdk/x11/gdkinput.c3
-rw-r--r--gdk/x11/gdkkeys-x11.c4
-rw-r--r--gdk/x11/gdkmain-x11.c2
-rw-r--r--gdk/x11/gdkpixmap-x11.c2
-rw-r--r--gdk/x11/gdkproperty-x11.c1
-rw-r--r--gdk/x11/gdkscreen-x11.c3
-rw-r--r--gdk/x11/gdkselection-x11.c1
-rw-r--r--gdk/x11/gdkvisual-x11.c1
-rw-r--r--gdk/x11/gdkwindow-x11.c3
-rw-r--r--gdk/x11/gdkxid.c1
-rw-r--r--gdk/x11/xsettings-client.c1
-rw-r--r--gdk/x11/xsettings-common.c1
109 files changed, 121 insertions, 51 deletions
diff --git a/gdk/gdk.c b/gdk/gdk.c
index c95371b56f..567cc4f57a 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include "config.h"
+#include <config.h>
#include <string.h>
#include <stdlib.h>
diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index 5e0d73b4e2..52232720c0 100644
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <time.h>
#include "gdkscreen.h"
diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index 77d5abf4bc..52b888e0b0 100644
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include "gdkcursor.h"
#include "gdkdisplay.h"
#include "gdkinternals.h"
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index d6a3a28fa7..bd5fe9eeb7 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -21,6 +21,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <glib.h>
#include "gdk.h" /* gdk_event_send_client_message() */
#include "gdkdisplay.h"
diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c
index 3ee8ad4338..4c04ed89c4 100644
--- a/gdk/gdkdnd.c
+++ b/gdk/gdkdnd.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <gdkdnd.h>
#include <gdkdrawable.h>
#include <gdkdisplay.h>
diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c
index da845032e5..2ea85fb2c6 100644
--- a/gdk/gdkdraw.c
+++ b/gdk/gdkdraw.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include "gdkdrawable.h"
#include "gdkinternals.h"
#include "gdkwindow.h"
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 7ecc2102eb..7ede828a9d 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <string.h> /* For memset() */
#include "gdk.h"
diff --git a/gdk/gdkfont.c b/gdk/gdkfont.c
index 2d4d04ced6..fd1c387e9f 100644
--- a/gdk/gdkfont.c
+++ b/gdk/gdkfont.c
@@ -26,6 +26,7 @@
#undef GDK_DISABLE_DEPRECATED
+#include <config.h>
#include "gdkdisplay.h"
#include "gdkfont.h"
#include "gdkinternals.h"
diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c
index d04de3bbbe..6898727b49 100644
--- a/gdk/gdkgc.c
+++ b/gdk/gdkgc.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <string.h>
#include "gdkgc.h"
diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c
index d3d332f5dc..3a033caf3d 100644
--- a/gdk/gdkglobals.c
+++ b/gdk/gdkglobals.c
@@ -24,11 +24,12 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
+
#include <stdio.h>
#include "gdktypes.h"
#include "gdkprivate.h"
-#include "config.h"
guint _gdk_debug_flags = 0;
gint _gdk_error_code = 0;
diff --git a/gdk/gdkimage.c b/gdk/gdkimage.c
index c7ef2efd90..7ba108d522 100644
--- a/gdk/gdkimage.c
+++ b/gdk/gdkimage.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <stdlib.h>
#include <sys/types.h>
diff --git a/gdk/gdkkeynames.c b/gdk/gdkkeynames.c
index 576fb05e85..b6120dfb86 100644
--- a/gdk/gdkkeynames.c
+++ b/gdk/gdkkeynames.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <glib/gprintf.h>
#include <stdlib.h>
#include <string.h>
diff --git a/gdk/gdkkeyuni.c b/gdk/gdkkeyuni.c
index aa07c9734f..a05c957b61 100644
--- a/gdk/gdkkeyuni.c
+++ b/gdk/gdkkeyuni.c
@@ -1,3 +1,4 @@
+#include <config.h>
#include "gdk.h"
/* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode
diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index 35a0a49685..a9d612ac91 100644
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -17,6 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include "gdkcolor.h"
#include "gdkgc.h"
#include "gdkpango.h"
diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c
index 2392776350..e131e45770 100644
--- a/gdk/gdkpixmap.c
+++ b/gdk/gdkpixmap.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include "gdkpixmap.h"
#include "gdkinternals.h"
#include "gdkpixbuf.h"
diff --git a/gdk/gdkpolyreg-generic.c b/gdk/gdkpolyreg-generic.c
index 838701d8cd..916d257b5f 100644
--- a/gdk/gdkpolyreg-generic.c
+++ b/gdk/gdkpolyreg-generic.c
@@ -46,6 +46,7 @@ SOFTWARE.
#define LARGE_COORDINATE 1000000
#define SMALL_COORDINATE -LARGE_COORDINATE
+#include <config.h>
#include <gdkregion.h>
#include "gdkregion-generic.h"
#include "gdkpoly-generic.h"
diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c
index c480d9f998..f59c7ec955 100644
--- a/gdk/gdkrectangle.c
+++ b/gdk/gdkrectangle.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <gdk/gdk.h>
void
diff --git a/gdk/gdkregion-generic.c b/gdk/gdkregion-generic.c
index 14bca401de..3c12fde3ff 100644
--- a/gdk/gdkregion-generic.c
+++ b/gdk/gdkregion-generic.c
@@ -68,6 +68,7 @@ SOFTWARE.
* the y-x-banding that's so nice to have...
*/
+#include <config.h>
#include <stdlib.h>
#include <string.h>
#include <gdkregion.h>
diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index 3dc47d9d18..13e034e160 100644
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -29,24 +29,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <math.h>
-
-#if HAVE_CONFIG_H
-# include <config.h>
-# if STDC_HEADERS
-# include <stdio.h>
-# include <stdlib.h>
-# include <string.h>
-# endif
-#else
-# include <stdio.h>
-# include <stdlib.h>
-#endif
-
+#include <stdlib.h>
+#include <string.h>
#define ENABLE_GRAYSCALE
-#include "config.h"
#include "gdkprivate.h"
#include "gdkinternals.h" /* _gdk_windowing_get_bits_for_depth() */
diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
index 329eab9540..3ab113e571 100644
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.c
@@ -21,6 +21,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include "gdk.h" /* For gdk_rectangle_intersect() */
#include "gdkcolor.h"
#include "gdkwindow.h"
diff --git a/gdk/gdkselection.c b/gdk/gdkselection.c
index 4aecef8864..cc0c453328 100644
--- a/gdk/gdkselection.c
+++ b/gdk/gdkselection.c
@@ -1,3 +1,4 @@
+#include <config.h>
#include "gdkproperty.h"
#include "gdkdisplay.h"
#include "gdkselection.h"
diff --git a/gdk/gdkvisual.c b/gdk/gdkvisual.c
index 9ee4b1a173..39c09e1405 100644
--- a/gdk/gdkvisual.c
+++ b/gdk/gdkvisual.c
@@ -21,6 +21,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include "gdkvisual.h"
#include "gdkscreen.h"
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 7ad957d59f..4df74dd6df 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include "gdkwindow.h"
#include "gdkinternals.h"
#include "gdk.h" /* For gdk_rectangle_union() */
diff --git a/gdk/linux-fb/gdkcolor-fb.c b/gdk/linux-fb/gdkcolor-fb.c
index 20903d6089..c2bbb10b2a 100644
--- a/gdk/linux-fb/gdkcolor-fb.c
+++ b/gdk/linux-fb/gdkcolor-fb.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <time.h>
#include <sys/ioctl.h>
#include <string.h>
diff --git a/gdk/linux-fb/gdkcursor-fb.c b/gdk/linux-fb/gdkcursor-fb.c
index 9212662d50..4253c04784 100644
--- a/gdk/linux-fb/gdkcursor-fb.c
+++ b/gdk/linux-fb/gdkcursor-fb.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include "gdkfb.h"
#include "gdkprivate-fb.h"
#include "gdkcursor.h"
diff --git a/gdk/linux-fb/gdkdisplay-fb.c b/gdk/linux-fb/gdkdisplay-fb.c
index a42bff2489..d9d798e19a 100644
--- a/gdk/linux-fb/gdkdisplay-fb.c
+++ b/gdk/linux-fb/gdkdisplay-fb.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include "gdk.h"
#include "gdkprivate-fb.h"
diff --git a/gdk/linux-fb/gdkdnd-fb.c b/gdk/linux-fb/gdkdnd-fb.c
index 4ce146d59d..cc84f2e10c 100644
--- a/gdk/linux-fb/gdkdnd-fb.c
+++ b/gdk/linux-fb/gdkdnd-fb.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include "gdk.h" /* For gdk_flush() */
#include "gdkdnd.h"
#include "gdkproperty.h"
diff --git a/gdk/linux-fb/gdkdrawable-fb2.c b/gdk/linux-fb/gdkdrawable-fb2.c
index a97ec00614..eca6797043 100644
--- a/gdk/linux-fb/gdkdrawable-fb2.c
+++ b/gdk/linux-fb/gdkdrawable-fb2.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include <config.h>
#include "gdkprivate-fb.h"
#include "mi.h"
#include <string.h>
diff --git a/gdk/linux-fb/gdkevents-fb.c b/gdk/linux-fb/gdkevents-fb.c
index 9001da48ed..64cf1e9a4d 100644
--- a/gdk/linux-fb/gdkevents-fb.c
+++ b/gdk/linux-fb/gdkevents-fb.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include "gdk.h"
#include "gdkprivate-fb.h"
#include "gdkinternals.h"
diff --git a/gdk/linux-fb/gdkfbmanager.c b/gdk/linux-fb/gdkfbmanager.c
index 2e82e89e6a..845a5b507d 100644
--- a/gdk/linux-fb/gdkfbmanager.c
+++ b/gdk/linux-fb/gdkfbmanager.c
@@ -1,3 +1,4 @@
+#include <config.h>
#include <glib.h>
#include <glib/gprintf.h>
diff --git a/gdk/linux-fb/gdkfbswitch.c b/gdk/linux-fb/gdkfbswitch.c
index b42c49cc4b..009178becc 100644
--- a/gdk/linux-fb/gdkfbswitch.c
+++ b/gdk/linux-fb/gdkfbswitch.c
@@ -1,3 +1,4 @@
+#include <config.h>
#include <glib.h>
#include <stdlib.h>
diff --git a/gdk/linux-fb/gdkfont-fb.c b/gdk/linux-fb/gdkfont-fb.c
index de4fd19ed8..b0bed69ee8 100644
--- a/gdk/linux-fb/gdkfont-fb.c
+++ b/gdk/linux-fb/gdkfont-fb.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <math.h>
#include <stdlib.h>
#include <string.h>
diff --git a/gdk/linux-fb/gdkgc-fb.c b/gdk/linux-fb/gdkgc-fb.c
index 9a927fbd5e..d1740306ec 100644
--- a/gdk/linux-fb/gdkgc-fb.c
+++ b/gdk/linux-fb/gdkgc-fb.c
@@ -1,3 +1,4 @@
+#include <config.h>
#include <string.h>
#include <stdlib.h>
diff --git a/gdk/linux-fb/gdkgeometry-fb.c b/gdk/linux-fb/gdkgeometry-fb.c
index 3161b18cf9..53fcd7c733 100644
--- a/gdk/linux-fb/gdkgeometry-fb.c
+++ b/gdk/linux-fb/gdkgeometry-fb.c
@@ -1,3 +1,4 @@
+#include <config.h>
#include "gdkprivate-fb.h"
void
diff --git a/gdk/linux-fb/gdkglobals-fb.c b/gdk/linux-fb/gdkglobals-fb.c
index e2131d303b..cd347c7278 100644
--- a/gdk/linux-fb/gdkglobals-fb.c
+++ b/gdk/linux-fb/gdkglobals-fb.c
@@ -28,7 +28,7 @@
#include "gdktypes.h"
#include "gdkprivate-fb.h"
-#include "config.h"
+#include <config.h>
GdkWindow *_gdk_fb_pointer_grab_window, *_gdk_fb_keyboard_grab_window, *_gdk_fb_pointer_grab_confine = NULL;
gboolean _gdk_fb_pointer_grab_owner_events;
diff --git a/gdk/linux-fb/gdkinput-none.c b/gdk/linux-fb/gdkinput-none.c
index c92a6a5cd1..0512fd7081 100644
--- a/gdk/linux-fb/gdkinput-none.c
+++ b/gdk/linux-fb/gdkinput-none.c
@@ -17,6 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include "gdkinputprivate.h"
/*
diff --git a/gdk/linux-fb/gdkinput.c b/gdk/linux-fb/gdkinput.c
index 20acbabcbe..ae9f012735 100644
--- a/gdk/linux-fb/gdkinput.c
+++ b/gdk/linux-fb/gdkinput.c
@@ -25,7 +25,7 @@
*/
#include <stdlib.h>
-#include "config.h"
+#include <config.h>
#include "gdkprivate-fb.h"
#include "gdkinput.h"
diff --git a/gdk/linux-fb/gdkkeyboard-fb.c b/gdk/linux-fb/gdkkeyboard-fb.c
index 1e21af46f3..0c1f2aa0f9 100644
--- a/gdk/linux-fb/gdkkeyboard-fb.c
+++ b/gdk/linux-fb/gdkkeyboard-fb.c
@@ -17,6 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <gdk/gdk.h>
#include <gdk/gdkinternals.h>
#include "gdkkeysyms.h"
diff --git a/gdk/linux-fb/gdkmain-fb.c b/gdk/linux-fb/gdkmain-fb.c
index b425f400c6..0c1e09d681 100644
--- a/gdk/linux-fb/gdkmain-fb.c
+++ b/gdk/linux-fb/gdkmain-fb.c
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include "config.h"
+#include <config.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
diff --git a/gdk/linux-fb/gdkmouse-fb.c b/gdk/linux-fb/gdkmouse-fb.c
index 516c7138f1..c95b0a09d2 100644
--- a/gdk/linux-fb/gdkmouse-fb.c
+++ b/gdk/linux-fb/gdkmouse-fb.c
@@ -17,6 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <gdk/gdk.h>
#include <gdk/gdkinternals.h>
#include "gdkprivate-fb.h"
diff --git a/gdk/linux-fb/gdkpango-fb.c b/gdk/linux-fb/gdkpango-fb.c
index 11f2632c3e..ccd15cdffa 100644
--- a/gdk/linux-fb/gdkpango-fb.c
+++ b/gdk/linux-fb/gdkpango-fb.c
@@ -1,3 +1,4 @@
+#include <config.h>
#include <glib.h>
#include "gdkprivate-fb.h"
#include "gdkpango.h"
diff --git a/gdk/linux-fb/gdkpixmap-fb.c b/gdk/linux-fb/gdkpixmap-fb.c
index c15ebadaf6..bafeb96e2e 100644
--- a/gdk/linux-fb/gdkpixmap-fb.c
+++ b/gdk/linux-fb/gdkpixmap-fb.c
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include "config.h"
+#include <config.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/gdk/linux-fb/gdkproperty-fb.c b/gdk/linux-fb/gdkproperty-fb.c
index 28c604e5a9..3c7ebc5e1b 100644
--- a/gdk/linux-fb/gdkproperty-fb.c
+++ b/gdk/linux-fb/gdkproperty-fb.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <string.h>
#include <time.h>
diff --git a/gdk/linux-fb/gdkrender-fb.c b/gdk/linux-fb/gdkrender-fb.c
index e8992a8206..912f66690c 100644
--- a/gdk/linux-fb/gdkrender-fb.c
+++ b/gdk/linux-fb/gdkrender-fb.c
@@ -1,4 +1,4 @@
-#include "config.h"
+#include <config.h>
#include "gdkprivate-fb.h"
#include <string.h>
#include <signal.h>
diff --git a/gdk/linux-fb/gdkscreen-fb.c b/gdk/linux-fb/gdkscreen-fb.c
index cf3563c637..fd237c3fb4 100644
--- a/gdk/linux-fb/gdkscreen-fb.c
+++ b/gdk/linux-fb/gdkscreen-fb.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include "gdk.h"
#include "gdkprivate-fb.h"
diff --git a/gdk/linux-fb/gdkselection-fb.c b/gdk/linux-fb/gdkselection-fb.c
index 2966ebf846..33b5284f4c 100644
--- a/gdk/linux-fb/gdkselection-fb.c
+++ b/gdk/linux-fb/gdkselection-fb.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <string.h>
#include "gdkproperty.h"
diff --git a/gdk/linux-fb/gdkvisual-fb.c b/gdk/linux-fb/gdkvisual-fb.c
index 7fd01ae3ae..4331bfc57d 100644
--- a/gdk/linux-fb/gdkvisual-fb.c
+++ b/gdk/linux-fb/gdkvisual-fb.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include "gdkvisual.h"
#include "gdkprivate-fb.h"
#include "gdkinternals.h"
diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c
index 42ba7ef52a..4c9419f255 100644
--- a/gdk/linux-fb/gdkwindow-fb.c
+++ b/gdk/linux-fb/gdkwindow-fb.c
@@ -25,7 +25,7 @@
*/
#include "gdk.h"
-#include "config.h"
+#include <config.h>
#include "gdkwindow.h"
#include "gdkinputprivate.h"
diff --git a/gdk/linux-fb/miarc.c b/gdk/linux-fb/miarc.c
index a4836d0334..d937a534d4 100644
--- a/gdk/linux-fb/miarc.c
+++ b/gdk/linux-fb/miarc.c
@@ -48,6 +48,7 @@ SOFTWARE.
#define _XOPEN_SOURCE_EXTENDED /* to get prototype for cbrt on some systems */
#define _XOPEN_SOURCE /* to get prototype for hypot on some systems */
+#include <config.h>
#include <string.h> /* memmove */
#include <limits.h>
diff --git a/gdk/linux-fb/midash.c b/gdk/linux-fb/midash.c
index c939976e78..6c087ee957 100644
--- a/gdk/linux-fb/midash.c
+++ b/gdk/linux-fb/midash.c
@@ -42,6 +42,7 @@ SOFTWARE.
******************************************************************/
/* $TOG: midash.c /main/14 1998/02/09 14:46:34 kaleb $ */
+#include <config.h>
#include "mi.h"
static miDashPtr CheckDashStorage();
diff --git a/gdk/linux-fb/mifillarc.c b/gdk/linux-fb/mifillarc.c
index 9ebf6e5b2b..2283529fb1 100644
--- a/gdk/linux-fb/mifillarc.c
+++ b/gdk/linux-fb/mifillarc.c
@@ -25,6 +25,7 @@ Author: Bob Scheifler, MIT X Consortium
/* $TOG: mifillarc.c /main/20 1998/02/09 14:46:52 kaleb $ */
+#include <config.h>
#include <math.h>
#include "mi.h"
#include "mifillarc.h"
diff --git a/gdk/linux-fb/mifpolycon.c b/gdk/linux-fb/mifpolycon.c
index dc1972157a..9c94500b57 100644
--- a/gdk/linux-fb/mifpolycon.c
+++ b/gdk/linux-fb/mifpolycon.c
@@ -41,6 +41,7 @@ SOFTWARE.
******************************************************************/
/* $TOG: mifpolycon.c /main/13 1998/02/09 14:47:05 kaleb $ */
+#include <config.h>
#include <math.h>
#include "mi.h"
#include "mifpoly.h"
diff --git a/gdk/linux-fb/mipoly.c b/gdk/linux-fb/mipoly.c
index de1d740a20..3854a60311 100644
--- a/gdk/linux-fb/mipoly.c
+++ b/gdk/linux-fb/mipoly.c
@@ -51,6 +51,7 @@ SOFTWARE.
* to the appropriate routine to actually scan convert the
* polygon.
*/
+#include <config.h>
#include "mi.h"
extern gboolean miFillGeneralPoly(
diff --git a/gdk/linux-fb/mipolygen.c b/gdk/linux-fb/mipolygen.c
index 6ad63c7a04..d27d01c653 100644
--- a/gdk/linux-fb/mipolygen.c
+++ b/gdk/linux-fb/mipolygen.c
@@ -41,6 +41,7 @@ SOFTWARE.
******************************************************************/
/* $TOG: mipolygen.c /main/9 1998/02/09 14:47:51 kaleb $ */
+#include <config.h>
#include "mi.h"
#include "mipoly.h"
diff --git a/gdk/linux-fb/mipolyutil.c b/gdk/linux-fb/mipolyutil.c
index 3cf3f9f9e8..a47d6a49ef 100644
--- a/gdk/linux-fb/mipolyutil.c
+++ b/gdk/linux-fb/mipolyutil.c
@@ -42,6 +42,7 @@ SOFTWARE.
******************************************************************/
/* $TOG: mipolyutil.c /main/6 1998/02/09 14:48:12 kaleb $ */
+#include <config.h>
#include <limits.h>
#include "mi.h"
#include "miscanfill.h"
diff --git a/gdk/linux-fb/mispans.c b/gdk/linux-fb/mispans.c
index 4e2be42ab7..0b96716810 100644
--- a/gdk/linux-fb/mispans.c
+++ b/gdk/linux-fb/mispans.c
@@ -44,6 +44,7 @@ SOFTWARE.
/* $TOG: mispans.c /main/7 1998/02/09 14:48:44 kaleb $ */
+#include <config.h>
#include "mi.h"
#include "mispans.h"
#include <string.h> /* for memmove */
diff --git a/gdk/linux-fb/miwideline.c b/gdk/linux-fb/miwideline.c
index 758b187b46..bc653554f8 100644
--- a/gdk/linux-fb/miwideline.c
+++ b/gdk/linux-fb/miwideline.c
@@ -31,6 +31,7 @@ from The Open Group.
* bresenham zero-width lines, except walks an X edge
*/
+#include <config.h>
#include <stdio.h>
#ifdef _XOPEN_SOURCE
#include <math.h>
diff --git a/gdk/linux-fb/mizerclip.c b/gdk/linux-fb/mizerclip.c
index f3e55f8233..52c5817a0d 100644
--- a/gdk/linux-fb/mizerclip.c
+++ b/gdk/linux-fb/mizerclip.c
@@ -42,6 +42,7 @@ SOFTWARE.
******************************************************************/
+#include <config.h>
#include "mi.h"
#include "miline.h"
diff --git a/gdk/linux-fb/mizerline.c b/gdk/linux-fb/mizerline.c
index 700cd038fb..0821bf210d 100644
--- a/gdk/linux-fb/mizerline.c
+++ b/gdk/linux-fb/mizerline.c
@@ -43,6 +43,7 @@ SOFTWARE.
******************************************************************/
/* $TOG: mizerline.c /main/18 1998/02/09 14:49:45 kaleb $ */
+#include <config.h>
#include "mi.h"
#include "miline.h"
diff --git a/gdk/testgdk.c b/gdk/testgdk.c
index d5dd6242c5..5971ad53e3 100644
--- a/gdk/testgdk.c
+++ b/gdk/testgdk.c
@@ -35,6 +35,7 @@
* into separate functions.
*/
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/gdk/win32/bdfcursor.c b/gdk/win32/bdfcursor.c
index a97ff8142c..d285770f45 100644
--- a/gdk/win32/bdfcursor.c
+++ b/gdk/win32/bdfcursor.c
@@ -1,3 +1,4 @@
+#include <config.h>
#include <string.h>
#include <stdio.h>
#include <errno.h>
diff --git a/gdk/win32/gdkcolor-win32.c b/gdk/win32/gdkcolor-win32.c
index 94ee7edc60..9974b04a46 100644
--- a/gdk/win32/gdkcolor-win32.c
+++ b/gdk/win32/gdkcolor-win32.c
@@ -25,6 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c
index b36c5c069c..c3b3fe4732 100644
--- a/gdk/win32/gdkcursor-win32.c
+++ b/gdk/win32/gdkcursor-win32.c
@@ -18,6 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include "gdkdisplay.h"
#include "gdkscreen.h"
#include "gdkcursor.h"
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 6651f0b4a3..4ecd1bb8ec 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -18,6 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include "gdk.h"
#include "gdkprivate-win32.h"
diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c
index 2cee5ba70d..f6b857b6b7 100644
--- a/gdk/win32/gdkdnd-win32.c
+++ b/gdk/win32/gdkdnd-win32.c
@@ -25,6 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <string.h>
/* #define OLE2_DND */
diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index d3bef3a840..a0ebf5e564 100644
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -25,6 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <math.h>
#include <stdio.h>
#include <glib.h>
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index b6b42a81e7..1302db8ef2 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -39,7 +39,7 @@
* not have TrackMouseEvent at all (?) --hb
*/
-#include "config.h"
+#include <config.h>
#include <glib/gprintf.h>
diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c
index e76f12bfec..e52d63749b 100644
--- a/gdk/win32/gdkfont-win32.c
+++ b/gdk/win32/gdkfont-win32.c
@@ -25,6 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c
index 8192f73375..cc3e715570 100644
--- a/gdk/win32/gdkgc-win32.c
+++ b/gdk/win32/gdkgc-win32.c
@@ -28,6 +28,7 @@
#define LINE_ATTRIBUTES (GDK_GC_LINE_WIDTH|GDK_GC_LINE_STYLE| \
GDK_GC_CAP_STYLE|GDK_GC_JOIN_STYLE)
+#include <config.h>
#include <string.h>
#include "gdkgc.h"
diff --git a/gdk/win32/gdkgeometry-win32.c b/gdk/win32/gdkgeometry-win32.c
index 8a3dc8ab8a..66a03b0f7e 100644
--- a/gdk/win32/gdkgeometry-win32.c
+++ b/gdk/win32/gdkgeometry-win32.c
@@ -29,6 +29,7 @@
* and Hans Breuer <hans@breuer.org>
*/
+#include <config.h>
#include "gdk.h" /* For gdk_rectangle_intersect */
#include "gdkregion.h"
#include "gdkregion-generic.h"
diff --git a/gdk/win32/gdkglobals-win32.c b/gdk/win32/gdkglobals-win32.c
index d965370210..3215877286 100644
--- a/gdk/win32/gdkglobals-win32.c
+++ b/gdk/win32/gdkglobals-win32.c
@@ -25,6 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include "gdktypes.h"
#include "gdkprivate-win32.h"
diff --git a/gdk/win32/gdkimage-win32.c b/gdk/win32/gdkimage-win32.c
index 60856cef41..7ed740db06 100644
--- a/gdk/win32/gdkimage-win32.c
+++ b/gdk/win32/gdkimage-win32.c
@@ -25,6 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include "gdkimage.h"
#include "gdkpixmap.h"
#include "gdkscreen.h" /* gdk_screen_get_default() */
diff --git a/gdk/win32/gdkinput-win32.c b/gdk/win32/gdkinput-win32.c
index 261a416c99..f3c9c3517a 100644
--- a/gdk/win32/gdkinput-win32.c
+++ b/gdk/win32/gdkinput-win32.c
@@ -25,7 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include "config.h"
+#include <config.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/gdk/win32/gdkinput.c b/gdk/win32/gdkinput.c
index 97bba2b4c7..68d215ffca 100644
--- a/gdk/win32/gdkinput.c
+++ b/gdk/win32/gdkinput.c
@@ -31,7 +31,7 @@
* be in x11/gdkinput-x11.c.
*/
-#include "config.h"
+#include <config.h>
#include "gdkdisplay.h"
#include "gdkinput.h"
diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c
index 04a1c3e936..1756ef256f 100644
--- a/gdk/win32/gdkkeys-win32.c
+++ b/gdk/win32/gdkkeys-win32.c
@@ -36,7 +36,7 @@
#include "gdkinternals.h"
#include "gdkkeysyms.h"
-#include "config.h"
+#include <config.h>
guint _gdk_keymap_serial = 0;
gboolean _gdk_keyboard_has_altgr = FALSE;
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index c8205500e1..a8aa92ce6f 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -25,7 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include "config.h"
+#include <config.h>
#include <glib/gprintf.h>
#include <stdlib.h>
diff --git a/gdk/win32/gdkpango-win32.c b/gdk/win32/gdkpango-win32.c
index 26271cd36e..732b270750 100644
--- a/gdk/win32/gdkpango-win32.c
+++ b/gdk/win32/gdkpango-win32.c
@@ -17,6 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include "gdkprivate-win32.h"
#include "gdkscreen.h"
#include "gdkpango.h"
diff --git a/gdk/win32/gdkpixmap-win32.c b/gdk/win32/gdkpixmap-win32.c
index a997cea990..d62b565455 100644
--- a/gdk/win32/gdkpixmap-win32.c
+++ b/gdk/win32/gdkpixmap-win32.c
@@ -25,6 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index d1bee10f83..5a0adc7286 100644
--- a/gdk/win32/gdkproperty-win32.c
+++ b/gdk/win32/gdkproperty-win32.c
@@ -25,6 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <string.h>
#include <stdlib.h>
#include <glib/gprintf.h>
diff --git a/gdk/win32/gdkscreen-win32.c b/gdk/win32/gdkscreen-win32.c
index cf69307d86..155be7a50b 100644
--- a/gdk/win32/gdkscreen-win32.c
+++ b/gdk/win32/gdkscreen-win32.c
@@ -17,6 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include "gdk.h"
#include "gdkprivate-win32.h"
diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c
index aa1285517f..e0b0ca6d4a 100644
--- a/gdk/win32/gdkselection-win32.c
+++ b/gdk/win32/gdkselection-win32.c
@@ -25,6 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <string.h>
#include <stdlib.h>
diff --git a/gdk/win32/gdkvisual-win32.c b/gdk/win32/gdkvisual-win32.c
index c647c1163b..d1d5a2effb 100644
--- a/gdk/win32/gdkvisual-win32.c
+++ b/gdk/win32/gdkvisual-win32.c
@@ -25,6 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <stdlib.h>
#include "gdkvisual.h"
diff --git a/gdk/win32/gdkwin32id.c b/gdk/win32/gdkwin32id.c
index 6cd73a34e6..b5d1025cdf 100644
--- a/gdk/win32/gdkwin32id.c
+++ b/gdk/win32/gdkwin32id.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <gdk/gdk.h>
#include "gdkprivate-win32.h"
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 17380587a5..a87136b33e 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -25,6 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <stdlib.h>
#include "gdk.h" /* gdk_rectangle_intersect */
diff --git a/gdk/x11/gdkasync.c b/gdk/x11/gdkasync.c
index 0d3799810d..7e906d9668 100644
--- a/gdk/x11/gdkasync.c
+++ b/gdk/x11/gdkasync.c
@@ -43,6 +43,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
+#include <config.h>
#include <X11/Xlibint.h>
#include "gdkasync.h"
#include "gdkx.h"
diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index 39b16a4ca9..6265dcfc7a 100644
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <time.h>
#include "gdkcolor.h"
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 24b5a340f7..ae50fc9007 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include "config.h"
+#include <config.h>
#include <X11/Xlib.h>
#include <X11/cursorfont.h>
#ifdef HAVE_XCURSOR
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index feb3119f9d..01c0aee26e 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <string.h>
diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index d18e9502eb..2c3744b773 100644
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -24,11 +24,11 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
+
#include "gdkx.h"
#include "gdkregion-generic.h"
-#include <config.h>
-
#include <pango/pangoxft.h>
#include <stdlib.h>
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 3be4d0fa63..294dd1f805 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -24,6 +24,8 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
+
#include "gdk.h"
#include "gdkprivate-x11.h"
#include "gdkinternals.h"
@@ -36,12 +38,7 @@
#include "xsettings-client.h"
-#if HAVE_CONFIG_H
-# include <config.h>
-# if STDC_HEADERS
-# include <string.h>
-# endif
-#endif
+#include <string.h>
#include "gdkinputprivate.h"
diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c
index ff299dc1ef..ce2f977ed8 100644
--- a/gdk/x11/gdkfont-x11.c
+++ b/gdk/x11/gdkfont-x11.c
@@ -26,6 +26,7 @@
#undef GDK_DISABLE_DEPRECATED
+#include <config.h>
#include <X11/Xlib.h>
#include <X11/Xos.h>
#include <locale.h>
diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c
index 976b1aa987..6e3c29888b 100644
--- a/gdk/x11/gdkgeometry-x11.c
+++ b/gdk/x11/gdkgeometry-x11.c
@@ -129,6 +129,7 @@
* unless the user has a _really_ huge screen.
*/
+#include <config.h>
#include "gdk.h" /* For gdk_rectangle_intersect */
#include "gdkprivate-x11.h"
#include "gdkx.h"
diff --git a/gdk/x11/gdkglobals-x11.c b/gdk/x11/gdkglobals-x11.c
index 7dd2a468a7..5332bc5ede 100644
--- a/gdk/x11/gdkglobals-x11.c
+++ b/gdk/x11/gdkglobals-x11.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <stdio.h>
#include "gdktypes.h"
diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index 263b149f19..bbcd39bebc 100644
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -24,8 +24,11 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
+
#include <locale.h>
#include <stdlib.h>
+#include <string.h>
#include "gdkx.h"
#include "gdk.h" /* For gdk_flush() */
@@ -34,13 +37,6 @@
#include "gdkinternals.h"
#include "gdkdisplay-x11.h"
-#if HAVE_CONFIG_H
-# include <config.h>
-# if STDC_HEADERS
-# include <string.h>
-# endif
-#endif
-
/* If this variable is FALSE, it indicates that we should
* avoid trying to use multibyte conversion functions and
diff --git a/gdk/x11/gdkinput-none.c b/gdk/x11/gdkinput-none.c
index 1c468e918a..7f8a92f771 100644
--- a/gdk/x11/gdkinput-none.c
+++ b/gdk/x11/gdkinput-none.c
@@ -17,6 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include "gdkinputprivate.h"
#include "gdkdisplay-x11.h"
diff --git a/gdk/x11/gdkinput-x11.c b/gdk/x11/gdkinput-x11.c
index f1c86a8dbb..1f294e79f4 100644
--- a/gdk/x11/gdkinput-x11.c
+++ b/gdk/x11/gdkinput-x11.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include "gdkinputprivate.h"
#include "gdkinternals.h"
#include "gdkx.h"
diff --git a/gdk/x11/gdkinput-xfree.c b/gdk/x11/gdkinput-xfree.c
index f8befc6ea7..88ec80ca90 100644
--- a/gdk/x11/gdkinput-xfree.c
+++ b/gdk/x11/gdkinput-xfree.c
@@ -17,6 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include "gdkinputprivate.h"
#include "gdkdisplay-x11.h"
diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index eb9fc32ae6..f9e6530261 100644
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -24,10 +24,11 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
+
#include <stdlib.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-#include "config.h"
#include "gdkx.h"
#include "gdkinput.h"
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index d58f862dde..b369b89beb 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -24,6 +24,8 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -39,8 +41,6 @@
#include "gdkdisplay-x11.h"
#include "gdkkeysyms.h"
-#include "config.h"
-
#ifdef HAVE_XKB
#include <X11/XKBlib.h>
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 3f8462f0a4..50f7df90d6 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include "config.h"
+#include <config.h>
#include <glib/gprintf.h>
#include <stdlib.h>
diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c
index 9b42234251..83a0ec5224 100644
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.c
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include "config.h"
+#include <config.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 3f722492a9..3c5057cdb4 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <string.h>
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 7bd7fcc951..f575ffa529 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -21,10 +21,11 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
+
#include <stdlib.h>
#include <string.h>
-#include <config.h>
#include <glib.h>
#include "gdkscreen.h"
#include "gdkscreen-x11.h"
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index ce11b5a40a..5b37607be7 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <string.h>
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index 25004749fd..29bcf8e56b 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 93bb3df6cc..a4a26d14b6 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -24,13 +24,14 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
+
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <netinet/in.h>
#include <unistd.h>
#include "gdk.h"
-#include "config.h"
#include "gdkwindow.h"
#include "gdkasync.h"
diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c
index ac851208b8..43fef8cc16 100644
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.c
@@ -24,6 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include "gdkprivate-x11.h"
#include "gdkdisplay-x11.h"
#include <stdio.h>
diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c
index 50c33ce801..46a562d0bf 100644
--- a/gdk/x11/xsettings-client.c
+++ b/gdk/x11/xsettings-client.c
@@ -20,6 +20,7 @@
*
* Author: Owen Taylor, Red Hat, Inc.
*/
+#include <config.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/gdk/x11/xsettings-common.c b/gdk/x11/xsettings-common.c
index 3d7444046a..97caf61e1c 100644
--- a/gdk/x11/xsettings-common.c
+++ b/gdk/x11/xsettings-common.c
@@ -20,6 +20,7 @@
*
* Author: Owen Taylor, Red Hat, Inc.
*/
+#include <config.h>
#include "string.h"
#include "stdlib.h"