summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2012-12-28 09:57:34 -0500
committerMatthias Clasen <mclasen@redhat.com>2012-12-28 09:57:56 -0500
commit5adecf183bae2b47aa70dbc4b9fdcdd053c23f96 (patch)
tree07d2d6654ac09500c7e960f76efe65de97bd31a0 /gdk
parent4d4b6a86581183bf82a67a51e7658cd3b1420a26 (diff)
downloadgtk+-5adecf183bae2b47aa70dbc4b9fdcdd053c23f96.tar.gz
Move single-include guards inside include guards
gcc has optimizations for include guards that only work if they are outermost in the the header. https://bugzilla.gnome.org/show_bug.cgi?id=689810
Diffstat (limited to 'gdk')
-rw-r--r--gdk/broadway/gdkbroadwaycursor.h6
-rw-r--r--gdk/broadway/gdkbroadwaydisplaymanager.h6
-rw-r--r--gdk/gdkapplaunchcontext.h6
-rw-r--r--gdk/gdkcairo.h6
-rw-r--r--gdk/gdkcolor.h6
-rw-r--r--gdk/gdkcursor.h6
-rw-r--r--gdk/gdkdevice.h6
-rw-r--r--gdk/gdkdevicemanager.h6
-rw-r--r--gdk/gdkdisplay.h6
-rw-r--r--gdk/gdkdisplaymanager.h6
-rw-r--r--gdk/gdkdnd.h6
-rw-r--r--gdk/gdkevents.h6
-rw-r--r--gdk/gdkkeys.h6
-rw-r--r--gdk/gdkmain.h6
-rw-r--r--gdk/gdkpango.h6
-rw-r--r--gdk/gdkpixbuf.h6
-rw-r--r--gdk/gdkproperty.h6
-rw-r--r--gdk/gdkrectangle.h6
-rw-r--r--gdk/gdkrgba.h6
-rw-r--r--gdk/gdkscreen.h6
-rw-r--r--gdk/gdkselection.h6
-rw-r--r--gdk/gdktestutils.h6
-rw-r--r--gdk/gdkthreads.h6
-rw-r--r--gdk/gdktypes.h6
-rw-r--r--gdk/gdkvisual.h6
-rw-r--r--gdk/gdkwindow.h6
-rw-r--r--gdk/quartz/gdkquartzcursor.h6
-rw-r--r--gdk/quartz/gdkquartzdevice-core.h6
-rw-r--r--gdk/quartz/gdkquartzdevicemanager-core.h6
-rw-r--r--gdk/quartz/gdkquartzdisplay.h6
-rw-r--r--gdk/quartz/gdkquartzdisplaymanager.h6
-rw-r--r--gdk/quartz/gdkquartzdnd.h6
-rw-r--r--gdk/quartz/gdkquartzkeys.h6
-rw-r--r--gdk/quartz/gdkquartzscreen.h6
-rw-r--r--gdk/quartz/gdkquartzutils.h6
-rw-r--r--gdk/quartz/gdkquartzvisual.h6
-rw-r--r--gdk/quartz/gdkquartzwindow.h6
-rw-r--r--gdk/win32/gdkwin32cursor.h6
-rw-r--r--gdk/win32/gdkwin32display.h6
-rw-r--r--gdk/win32/gdkwin32displaymanager.h6
-rw-r--r--gdk/win32/gdkwin32dnd.h6
-rw-r--r--gdk/win32/gdkwin32keys.h6
-rw-r--r--gdk/win32/gdkwin32screen.h6
-rw-r--r--gdk/win32/gdkwin32window.h6
-rw-r--r--gdk/x11/gdkx11applaunchcontext.h6
-rw-r--r--gdk/x11/gdkx11cursor.h6
-rw-r--r--gdk/x11/gdkx11device.h6
-rw-r--r--gdk/x11/gdkx11devicemanager.h6
-rw-r--r--gdk/x11/gdkx11display.h6
-rw-r--r--gdk/x11/gdkx11displaymanager.h6
-rw-r--r--gdk/x11/gdkx11dnd.h6
-rw-r--r--gdk/x11/gdkx11keys.h6
-rw-r--r--gdk/x11/gdkx11property.h6
-rw-r--r--gdk/x11/gdkx11screen.h6
-rw-r--r--gdk/x11/gdkx11selection.h6
-rw-r--r--gdk/x11/gdkx11utils.h6
-rw-r--r--gdk/x11/gdkx11visual.h6
-rw-r--r--gdk/x11/gdkx11window.h6
58 files changed, 174 insertions, 174 deletions
diff --git a/gdk/broadway/gdkbroadwaycursor.h b/gdk/broadway/gdkbroadwaycursor.h
index 65a437b7d0..94fd011ce4 100644
--- a/gdk/broadway/gdkbroadwaycursor.h
+++ b/gdk/broadway/gdkbroadwaycursor.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_BROADWAY_CURSOR_H__
+#define __GDK_BROADWAY_CURSOR_H__
+
#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkbroadway.h> can be included directly."
#endif
-#ifndef __GDK_BROADWAY_CURSOR_H__
-#define __GDK_BROADWAY_CURSOR_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/broadway/gdkbroadwaydisplaymanager.h b/gdk/broadway/gdkbroadwaydisplaymanager.h
index c90f535860..3c607ea544 100644
--- a/gdk/broadway/gdkbroadwaydisplaymanager.h
+++ b/gdk/broadway/gdkbroadwaydisplaymanager.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_BROADWAY_DISPLAY_MANAGER_H__
+#define __GDK_BROADWAY_DISPLAY_MANAGER_H__
+
#if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkbroadway.h> can be included directly."
#endif
-#ifndef __GDK_BROADWAY_DISPLAY_MANAGER_H__
-#define __GDK_BROADWAY_DISPLAY_MANAGER_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index 899fe01ac5..af141dca6c 100644
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -18,13 +18,13 @@
* Author: Alexander Larsson <alexl@redhat.com>
*/
+#ifndef __GDK_APP_LAUNCH_CONTEXT_H__
+#define __GDK_APP_LAUNCH_CONTEXT_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_APP_LAUNCH_CONTEXT_H__
-#define __GDK_APP_LAUNCH_CONTEXT_H__
-
#include <gio/gio.h>
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
diff --git a/gdk/gdkcairo.h b/gdk/gdkcairo.h
index 5a969d2bc3..5d72f3fac6 100644
--- a/gdk/gdkcairo.h
+++ b/gdk/gdkcairo.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_CAIRO_H__
+#define __GDK_CAIRO_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_CAIRO_H__
-#define __GDK_CAIRO_H__
-
#include <gdk/gdkversionmacros.h>
#include <gdk/gdkcolor.h>
#include <gdk/gdkrgba.h>
diff --git a/gdk/gdkcolor.h b/gdk/gdkcolor.h
index 9554c0e7e6..74310f3716 100644
--- a/gdk/gdkcolor.h
+++ b/gdk/gdkcolor.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_COLOR_H__
+#define __GDK_COLOR_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_COLOR_H__
-#define __GDK_COLOR_H__
-
#include <cairo.h>
#include <gdk/gdktypes.h>
diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index 9c5399764b..16e965b9c9 100644
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_CURSOR_H__
+#define __GDK_CURSOR_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_CURSOR_H__
-#define __GDK_CURSOR_H__
-
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index 02c26cc177..c620905a60 100644
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_DEVICE_H__
+#define __GDK_DEVICE_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_DEVICE_H__
-#define __GDK_DEVICE_H__
-
#include <gdk/gdktypes.h>
diff --git a/gdk/gdkdevicemanager.h b/gdk/gdkdevicemanager.h
index 3c21c9cab5..f0e1afe5a8 100644
--- a/gdk/gdkdevicemanager.h
+++ b/gdk/gdkdevicemanager.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_DEVICE_MANAGER_H__
+#define __GDK_DEVICE_MANAGER_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_DEVICE_MANAGER_H__
-#define __GDK_DEVICE_MANAGER_H__
-
#include <gdk/gdktypes.h>
#include <gdk/gdkdevice.h>
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 86e0735088..c0566e7c55 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -19,13 +19,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_DISPLAY_H__
+#define __GDK_DISPLAY_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_DISPLAY_H__
-#define __GDK_DISPLAY_H__
-
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
#include <gdk/gdkevents.h>
diff --git a/gdk/gdkdisplaymanager.h b/gdk/gdkdisplaymanager.h
index a248bbd667..419b3f5739 100644
--- a/gdk/gdkdisplaymanager.h
+++ b/gdk/gdkdisplaymanager.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_DISPLAY_MANAGER_H__
+#define __GDK_DISPLAY_MANAGER_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_DISPLAY_MANAGER_H__
-#define __GDK_DISPLAY_MANAGER_H__
-
#include <gdk/gdktypes.h>
#include <gdk/gdkdisplay.h>
diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index 3b51487a79..c9fa16a0e8 100644
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_DND_H__
+#define __GDK_DND_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_DND_H__
-#define __GDK_DND_H__
-
#include <gdk/gdktypes.h>
#include <gdk/gdkdevice.h>
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index 9b1a869c8f..694505567d 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_EVENTS_H__
+#define __GDK_EVENTS_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_EVENTS_H__
-#define __GDK_EVENTS_H__
-
#include <gdk/gdkversionmacros.h>
#include <gdk/gdkcolor.h>
#include <gdk/gdktypes.h>
diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h
index 28d46d2970..f402270ad9 100644
--- a/gdk/gdkkeys.h
+++ b/gdk/gdkkeys.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_KEYS_H__
+#define __GDK_KEYS_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_KEYS_H__
-#define __GDK_KEYS_H__
-
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h
index d251c427f1..27788dd2da 100644
--- a/gdk/gdkmain.h
+++ b/gdk/gdkmain.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_MAIN_H__
+#define __GDK_MAIN_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_MAIN_H__
-#define __GDK_MAIN_H__
-
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h
index c05d13593a..28402cd0d0 100644
--- a/gdk/gdkpango.h
+++ b/gdk/gdkpango.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_PANGO_H__
+#define __GDK_PANGO_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_PANGO_H__
-#define __GDK_PANGO_H__
-
#include <gdk/gdktypes.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h
index b8b8bda472..96e2d7f7dd 100644
--- a/gdk/gdkpixbuf.h
+++ b/gdk/gdkpixbuf.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_PIXBUF_H__
+#define __GDK_PIXBUF_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_PIXBUF_H__
-#define __GDK_PIXBUF_H__
-
#include <cairo.h>
#include <gdk/gdktypes.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/gdk/gdkproperty.h b/gdk/gdkproperty.h
index eca0ae0c46..795f1d4971 100644
--- a/gdk/gdkproperty.h
+++ b/gdk/gdkproperty.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_PROPERTY_H__
+#define __GDK_PROPERTY_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_PROPERTY_H__
-#define __GDK_PROPERTY_H__
-
#include <gdk/gdktypes.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkrectangle.h b/gdk/gdkrectangle.h
index f3ad7a0903..2a17299b5d 100644
--- a/gdk/gdkrectangle.h
+++ b/gdk/gdkrectangle.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_RECTANGLE_H__
+#define __GDK_RECTANGLE_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_RECTANGLE_H__
-#define __GDK_RECTANGLE_H__
-
#include <gdk/gdktypes.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkrgba.h b/gdk/gdkrgba.h
index 3e6aed5866..9f0f0743b2 100644
--- a/gdk/gdkrgba.h
+++ b/gdk/gdkrgba.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_RGBA_H__
+#define __GDK_RGBA_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_RGBA_H__
-#define __GDK_RGBA_H__
-
#include <gdk/gdktypes.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index b26f261821..e3a66c654d 100644
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -19,13 +19,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_SCREEN_H__
+#define __GDK_SCREEN_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_SCREEN_H__
-#define __GDK_SCREEN_H__
-
#include <cairo.h>
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
diff --git a/gdk/gdkselection.h b/gdk/gdkselection.h
index f8a5195dbb..ae964e78f5 100644
--- a/gdk/gdkselection.h
+++ b/gdk/gdkselection.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_SELECTION_H__
+#define __GDK_SELECTION_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_SELECTION_H__
-#define __GDK_SELECTION_H__
-
#include <gdk/gdktypes.h>
G_BEGIN_DECLS
diff --git a/gdk/gdktestutils.h b/gdk/gdktestutils.h
index 4471e887ee..dcbb6ea2de 100644
--- a/gdk/gdktestutils.h
+++ b/gdk/gdktestutils.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_TEST_UTILS_H__
+#define __GDK_TEST_UTILS_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_TEST_UTILS_H__
-#define __GDK_TEST_UTILS_H__
-
#include <gdk/gdkwindow.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkthreads.h b/gdk/gdkthreads.h
index 49f15afa55..8869cfc014 100644
--- a/gdk/gdkthreads.h
+++ b/gdk/gdkthreads.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_THREADS_H__
+#define __GDK_THREADS_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_THREADS_H__
-#define __GDK_THREADS_H__
-
#include <gdk/gdktypes.h>
G_BEGIN_DECLS
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 2b25473da9..97e4540a67 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_TYPES_H__
+#define __GDK_TYPES_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_TYPES_H__
-#define __GDK_TYPES_H__
-
/* GDK uses "glib". (And so does GTK).
*/
#include <glib.h>
diff --git a/gdk/gdkvisual.h b/gdk/gdkvisual.h
index 207e09a60d..c15808e8e9 100644
--- a/gdk/gdkvisual.h
+++ b/gdk/gdkvisual.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_VISUAL_H__
+#define __GDK_VISUAL_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_VISUAL_H__
-#define __GDK_VISUAL_H__
-
#include <gdk/gdktypes.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 10239132ba..4a5daf8482 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_WINDOW_H__
+#define __GDK_WINDOW_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_WINDOW_H__
-#define __GDK_WINDOW_H__
-
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
#include <gdk/gdkevents.h>
diff --git a/gdk/quartz/gdkquartzcursor.h b/gdk/quartz/gdkquartzcursor.h
index 37b444eff7..14ee12dbef 100644
--- a/gdk/quartz/gdkquartzcursor.h
+++ b/gdk/quartz/gdkquartzcursor.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_CURSOR_H__
+#define __GDK_QUARTZ_CURSOR_H__
+
#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_CURSOR_H__
-#define __GDK_QUARTZ_CURSOR_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzdevice-core.h b/gdk/quartz/gdkquartzdevice-core.h
index 753e1305b7..f239016426 100644
--- a/gdk/quartz/gdkquartzdevice-core.h
+++ b/gdk/quartz/gdkquartzdevice-core.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_DEVICE_CORE_H__
+#define __GDK_QUARTZ_DEVICE_CORE_H__
+
#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_DEVICE_CORE_H__
-#define __GDK_QUARTZ_DEVICE_CORE_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzdevicemanager-core.h b/gdk/quartz/gdkquartzdevicemanager-core.h
index 29f008cfb6..d8aa156e6f 100644
--- a/gdk/quartz/gdkquartzdevicemanager-core.h
+++ b/gdk/quartz/gdkquartzdevicemanager-core.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_DEVICE_MANAGER_CORE_H__
+#define __GDK_QUARTZ_DEVICE_MANAGER_CORE_H__
+
#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_DEVICE_MANAGER_CORE_H__
-#define __GDK_QUARTZ_DEVICE_MANAGER_CORE_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzdisplay.h b/gdk/quartz/gdkquartzdisplay.h
index e99128c5e9..786a511556 100644
--- a/gdk/quartz/gdkquartzdisplay.h
+++ b/gdk/quartz/gdkquartzdisplay.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_DISPLAY_H__
+#define __GDK_QUARTZ_DISPLAY_H__
+
#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_DISPLAY_H__
-#define __GDK_QUARTZ_DISPLAY_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzdisplaymanager.h b/gdk/quartz/gdkquartzdisplaymanager.h
index 4b7d80188a..11662158cc 100644
--- a/gdk/quartz/gdkquartzdisplaymanager.h
+++ b/gdk/quartz/gdkquartzdisplaymanager.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_DISPLAY_MANAGER_H__
+#define __GDK_QUARTZ_DISPLAY_MANAGER_H__
+
#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_DISPLAY_MANAGER_H__
-#define __GDK_QUARTZ_DISPLAY_MANAGER_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzdnd.h b/gdk/quartz/gdkquartzdnd.h
index bc4a1226bd..201b474b28 100644
--- a/gdk/quartz/gdkquartzdnd.h
+++ b/gdk/quartz/gdkquartzdnd.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_DND_H__
+#define __GDK_QUARTZ_DND_H__
+
#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_DND_H__
-#define __GDK_QUARTZ_DND_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzkeys.h b/gdk/quartz/gdkquartzkeys.h
index 63bfe6de6a..fc4f4b0053 100644
--- a/gdk/quartz/gdkquartzkeys.h
+++ b/gdk/quartz/gdkquartzkeys.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_KEYS_H__
+#define __GDK_QUARTZ_KEYS_H__
+
#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_KEYS_H__
-#define __GDK_QUARTZ_KEYS_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzscreen.h b/gdk/quartz/gdkquartzscreen.h
index 733d5d271f..5642d9579f 100644
--- a/gdk/quartz/gdkquartzscreen.h
+++ b/gdk/quartz/gdkquartzscreen.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_SCREEN_H__
+#define __GDK_QUARTZ_SCREEN_H__
+
#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_SCREEN_H__
-#define __GDK_QUARTZ_SCREEN_H__
-
G_BEGIN_DECLS
#include <gdk/gdk.h>
diff --git a/gdk/quartz/gdkquartzutils.h b/gdk/quartz/gdkquartzutils.h
index 27aaae5d95..127ce177bd 100644
--- a/gdk/quartz/gdkquartzutils.h
+++ b/gdk/quartz/gdkquartzutils.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_UTILS_H__
+#define __GDK_QUARTZ_UTILS_H__
+
#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_UTILS_H__
-#define __GDK_QUARTZ_UTILS_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzvisual.h b/gdk/quartz/gdkquartzvisual.h
index 98bd87f330..3199322f5c 100644
--- a/gdk/quartz/gdkquartzvisual.h
+++ b/gdk/quartz/gdkquartzvisual.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_VISUAL_H__
+#define __GDK_QUARTZ_VISUAL_H__
+
#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_VISUAL_H__
-#define __GDK_QUARTZ_VISUAL_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzwindow.h b/gdk/quartz/gdkquartzwindow.h
index 3f1fbd6c8a..d33087cb18 100644
--- a/gdk/quartz/gdkquartzwindow.h
+++ b/gdk/quartz/gdkquartzwindow.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_WINDOW_H__
+#define __GDK_QUARTZ_WINDOW_H__
+
#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_WINDOW_H__
-#define __GDK_QUARTZ_WINDOW_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/win32/gdkwin32cursor.h b/gdk/win32/gdkwin32cursor.h
index 361cb92dcb..99b479f091 100644
--- a/gdk/win32/gdkwin32cursor.h
+++ b/gdk/win32/gdkwin32cursor.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_WIN32_CURSOR_H__
+#define __GDK_WIN32_CURSOR_H__
+
#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkwin32.h> can be included directly."
#endif
-#ifndef __GDK_WIN32_CURSOR_H__
-#define __GDK_WIN32_CURSOR_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/win32/gdkwin32display.h b/gdk/win32/gdkwin32display.h
index eb1bfeb6f6..ca257f2d83 100644
--- a/gdk/win32/gdkwin32display.h
+++ b/gdk/win32/gdkwin32display.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_WIN32_DISPLAY_H__
+#define __GDK_WIN32_DISPLAY_H__
+
#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkwin32.h> can be included directly."
#endif
-#ifndef __GDK_WIN32_DISPLAY_H__
-#define __GDK_WIN32_DISPLAY_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/win32/gdkwin32displaymanager.h b/gdk/win32/gdkwin32displaymanager.h
index 9217f435c9..e5d96b5565 100644
--- a/gdk/win32/gdkwin32displaymanager.h
+++ b/gdk/win32/gdkwin32displaymanager.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_WIN32_DISPLAY_MANAGER_H__
+#define __GDK_WIN32_DISPLAY_MANAGER_H__
+
#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkwin32.h> can be included directly."
#endif
-#ifndef __GDK_WIN32_DISPLAY_MANAGER_H__
-#define __GDK_WIN32_DISPLAY_MANAGER_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/win32/gdkwin32dnd.h b/gdk/win32/gdkwin32dnd.h
index 06ad679848..457d3ccfbb 100644
--- a/gdk/win32/gdkwin32dnd.h
+++ b/gdk/win32/gdkwin32dnd.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_WIN32_DND_H__
+#define __GDK_WIN32_DND_H__
+
#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkwin32.h> can be included directly."
#endif
-#ifndef __GDK_WIN32_DND_H__
-#define __GDK_WIN32_DND_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/win32/gdkwin32keys.h b/gdk/win32/gdkwin32keys.h
index af90763a07..c271d67861 100644
--- a/gdk/win32/gdkwin32keys.h
+++ b/gdk/win32/gdkwin32keys.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_WIN32_KEYS_H__
+#define __GDK_WIN32_KEYS_H__
+
#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkwin32.h> can be included directly."
#endif
-#ifndef __GDK_WIN32_KEYS_H__
-#define __GDK_WIN32_KEYS_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/win32/gdkwin32screen.h b/gdk/win32/gdkwin32screen.h
index a239166f3d..e64001b271 100644
--- a/gdk/win32/gdkwin32screen.h
+++ b/gdk/win32/gdkwin32screen.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_WIN32_SCREEN_H__
+#define __GDK_WIN32_SCREEN_H__
+
#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkwin32.h> can be included directly."
#endif
-#ifndef __GDK_WIN32_SCREEN_H__
-#define __GDK_WIN32_SCREEN_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/win32/gdkwin32window.h b/gdk/win32/gdkwin32window.h
index 3bb29fc26d..ef5e11f888 100644
--- a/gdk/win32/gdkwin32window.h
+++ b/gdk/win32/gdkwin32window.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_WIN32_WINDOW_H__
+#define __GDK_WIN32_WINDOW_H__
+
#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkwin32.h> can be included directly."
#endif
-#ifndef __GDK_WIN32_WINDOW_H__
-#define __GDK_WIN32_WINDOW_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/x11/gdkx11applaunchcontext.h b/gdk/x11/gdkx11applaunchcontext.h
index b1cc129ce9..7e444e813c 100644
--- a/gdk/x11/gdkx11applaunchcontext.h
+++ b/gdk/x11/gdkx11applaunchcontext.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_X11_APP_LAUNCH_CONTEXT_H__
+#define __GDK_X11_APP_LAUNCH_CONTEXT_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_APP_LAUNCH_CONTEXT_H__
-#define __GDK_X11_APP_LAUNCH_CONTEXT_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/x11/gdkx11cursor.h b/gdk/x11/gdkx11cursor.h
index aa44ceab6a..0c0f9b2a4a 100644
--- a/gdk/x11/gdkx11cursor.h
+++ b/gdk/x11/gdkx11cursor.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_CURSOR_H__
+#define __GDK_X11_CURSOR_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_CURSOR_H__
-#define __GDK_X11_CURSOR_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11device.h b/gdk/x11/gdkx11device.h
index 2380c2038d..f42613bfbe 100644
--- a/gdk/x11/gdkx11device.h
+++ b/gdk/x11/gdkx11device.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_X11_DEVICE_H__
+#define __GDK_X11_DEVICE_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_DEVICE_H__
-#define __GDK_X11_DEVICE_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/x11/gdkx11devicemanager.h b/gdk/x11/gdkx11devicemanager.h
index 542e42e2a7..14918613b5 100644
--- a/gdk/x11/gdkx11devicemanager.h
+++ b/gdk/x11/gdkx11devicemanager.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_X11_DEVICE_MANAGER_H__
+#define __GDK_X11_DEVICE_MANAGER_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_DEVICE_MANAGER_H__
-#define __GDK_X11_DEVICE_MANAGER_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h
index ade98f2e7b..323463b324 100644
--- a/gdk/x11/gdkx11display.h
+++ b/gdk/x11/gdkx11display.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_DISPLAY_H__
+#define __GDK_X11_DISPLAY_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_DISPLAY_H__
-#define __GDK_X11_DISPLAY_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11displaymanager.h b/gdk/x11/gdkx11displaymanager.h
index 0852c72774..3ffb944238 100644
--- a/gdk/x11/gdkx11displaymanager.h
+++ b/gdk/x11/gdkx11displaymanager.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_X11_DISPLAY_MANAGER_H__
+#define __GDK_X11_DISPLAY_MANAGER_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_DISPLAY_MANAGER_H__
-#define __GDK_X11_DISPLAY_MANAGER_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/x11/gdkx11dnd.h b/gdk/x11/gdkx11dnd.h
index f1bc7888bb..856d2f1090 100644
--- a/gdk/x11/gdkx11dnd.h
+++ b/gdk/x11/gdkx11dnd.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_X11_DND_H__
+#define __GDK_X11_DND_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_DND_H__
-#define __GDK_X11_DND_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/x11/gdkx11keys.h b/gdk/x11/gdkx11keys.h
index a417e33cf2..088cd0f95b 100644
--- a/gdk/x11/gdkx11keys.h
+++ b/gdk/x11/gdkx11keys.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_X11_KEYS_H__
+#define __GDK_X11_KEYS_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_KEYS_H__
-#define __GDK_X11_KEYS_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h
index 53247b8959..f1fd9346df 100644
--- a/gdk/x11/gdkx11property.h
+++ b/gdk/x11/gdkx11property.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_PROPERTY_H__
+#define __GDK_X11_PROPERTY_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_PROPERTY_H__
-#define __GDK_X11_PROPERTY_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11screen.h b/gdk/x11/gdkx11screen.h
index a612692763..1c974ef286 100644
--- a/gdk/x11/gdkx11screen.h
+++ b/gdk/x11/gdkx11screen.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_SCREEN_H__
+#define __GDK_X11_SCREEN_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_SCREEN_H__
-#define __GDK_X11_SCREEN_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11selection.h b/gdk/x11/gdkx11selection.h
index 119dcf5a72..e13b78d574 100644
--- a/gdk/x11/gdkx11selection.h
+++ b/gdk/x11/gdkx11selection.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_SELECTION_H__
+#define __GDK_X11_SELECTION_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_SELECTION_H__
-#define __GDK_X11_SELECTION_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11utils.h b/gdk/x11/gdkx11utils.h
index fd943fda2c..4f62336391 100644
--- a/gdk/x11/gdkx11utils.h
+++ b/gdk/x11/gdkx11utils.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_UTILS_H__
+#define __GDK_X11_UTILS_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_UTILS_H__
-#define __GDK_X11_UTILS_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11visual.h b/gdk/x11/gdkx11visual.h
index 026bc92422..7c39ec2d8c 100644
--- a/gdk/x11/gdkx11visual.h
+++ b/gdk/x11/gdkx11visual.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_VISUAL_H__
+#define __GDK_X11_VISUAL_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_VISUAL_H__
-#define __GDK_X11_VISUAL_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11window.h b/gdk/x11/gdkx11window.h
index 43ea98435c..47bd5c5e6c 100644
--- a/gdk/x11/gdkx11window.h
+++ b/gdk/x11/gdkx11window.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_WINDOW_H__
+#define __GDK_X11_WINDOW_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_WINDOW_H__
-#define __GDK_X11_WINDOW_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>