diff --git a/gdk/broadway/gdkbroadwaycursor.h b/gdk/broadway/gdkbroadwaycursor.h
index 65a437b..94fd011 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 c90f535..3c607ea 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 899fe01..af141dc 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 5a969d2..5d72f3f 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 9554c0e..74310f3 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 9c53997..16e965b 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 02c26cc..c620905 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 3c21c9c..f0e1afe 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 86e0735..c0566e7 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 a248bbd..419b3f5 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 3b51487..c9fa16a 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 9b1a869..6945055 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 28d46d2..f402270 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 d251c42..27788dd 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 c05d135..28402cd 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 b8b8bda..96e2d7f 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 eca0ae0..795f1d4 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 f3ad7a0..2a17299 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 3e6aed5..9f0f074 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 b26f261..e3a66c6 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 f8a5195..ae964e7 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 4471e88..dcbb6ea 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 49f15af..8869cfc 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 2b25473..97e4540 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 207e09a..c15808e 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 fded029..587a123 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 37b444e..14ee12d 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 753e130..f239016 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 29f008c..d8aa156 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 e99128c..786a511 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 4b7d801..1166215 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 bc4a122..201b474 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 63bfe6d..fc4f4b0 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 733d5d2..5642d95 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 27aaae5..127ce17 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 98bd87f..3199322 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 3f1fbd6..d33087c 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 361cb92..99b479f 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 eb1bfeb..ca257f2 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 9217f43..e5d96b5 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 06ad679..457d3cc 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 af90763..c271d67 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 a239166..e64001b 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 3bb29fc..ef5e11f 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 b1cc129..7e444e8 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 aa44cea..0c0f9b2 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 2380c20..f42613b 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 542e42e..1491861 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 ade98f2..323463b 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 0852c72..3ffb944 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 f1bc788..856d2f1 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 a417e33..088cd0f 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 53247b8..f1fd934 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 a612692..1c974ef 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 119dcf5..e13b78d 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 fd943fd..4f62336 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 026bc92..7c39ec2 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 43ea984..47bd5c5 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>
diff --git a/gtk/deprecated/gtkcolorsel.h b/gtk/deprecated/gtkcolorsel.h
index 3dd3712..37212eb 100644
--- a/gtk/deprecated/gtkcolorsel.h
+++ b/gtk/deprecated/gtkcolorsel.h
@@ -23,13 +23,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_COLOR_SELECTION_H__
+#define __GTK_COLOR_SELECTION_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COLOR_SELECTION_H__
-#define __GTK_COLOR_SELECTION_H__
-
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkbox.h>
 
diff --git a/gtk/deprecated/gtkcolorseldialog.h b/gtk/deprecated/gtkcolorseldialog.h
index 8a681ac..3722466 100644
--- a/gtk/deprecated/gtkcolorseldialog.h
+++ b/gtk/deprecated/gtkcolorseldialog.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_COLOR_SELECTION_DIALOG_H__
+#define __GTK_COLOR_SELECTION_DIALOG_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COLOR_SELECTION_DIALOG_H__
-#define __GTK_COLOR_SELECTION_DIALOG_H__
-
 #include <gtk/gtkdialog.h>
 #include <gtk/deprecated/gtkcolorsel.h>
 
diff --git a/gtk/deprecated/gtkfontsel.h b/gtk/deprecated/gtkfontsel.h
index f33ad76..1e72600 100644
--- a/gtk/deprecated/gtkfontsel.h
+++ b/gtk/deprecated/gtkfontsel.h
@@ -26,14 +26,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_FONTSEL_H__
 #define __GTK_FONTSEL_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkbox.h>
 
diff --git a/gtk/deprecated/gtkgradient.h b/gtk/deprecated/gtkgradient.h
index 767461f..fe6dc8c 100644
--- a/gtk/deprecated/gtkgradient.h
+++ b/gtk/deprecated/gtkgradient.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_GRADIENT_H__
+#define __GTK_GRADIENT_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_GRADIENT_H__
-#define __GTK_GRADIENT_H__
-
 #include <gdk/gdk.h>
 #include <gtk/gtkstylecontext.h>
 #include <gtk/gtkstyleproperties.h>
diff --git a/gtk/deprecated/gtkhandlebox.h b/gtk/deprecated/gtkhandlebox.h
index 0f84fc6..9c618a8 100644
--- a/gtk/deprecated/gtkhandlebox.h
+++ b/gtk/deprecated/gtkhandlebox.h
@@ -27,13 +27,13 @@
  * their parents.
  */
 
+#ifndef __GTK_HANDLE_BOX_H__
+#define __GTK_HANDLE_BOX_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_HANDLE_BOX_H__
-#define __GTK_HANDLE_BOX_H__
-
 #include <gtk/gtkbin.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkhbbox.h b/gtk/deprecated/gtkhbbox.h
index 26714c8..a53d54a 100644
--- a/gtk/deprecated/gtkhbbox.h
+++ b/gtk/deprecated/gtkhbbox.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_HBUTTON_BOX_H__
+#define __GTK_HBUTTON_BOX_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_HBUTTON_BOX_H__
-#define __GTK_HBUTTON_BOX_H__
-
 #include <gtk/gtkbbox.h>
 
 
diff --git a/gtk/deprecated/gtkhbox.h b/gtk/deprecated/gtkhbox.h
index ec4f9c5..13e4d8a 100644
--- a/gtk/deprecated/gtkhbox.h
+++ b/gtk/deprecated/gtkhbox.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_HBOX_H__
 #define __GTK_HBOX_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbox.h>
 
 
diff --git a/gtk/deprecated/gtkhpaned.h b/gtk/deprecated/gtkhpaned.h
index e637939..da0bb62 100644
--- a/gtk/deprecated/gtkhpaned.h
+++ b/gtk/deprecated/gtkhpaned.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_HPANED_H__
+#define __GTK_HPANED_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_HPANED_H__
-#define __GTK_HPANED_H__
-
 #include <gtk/gtkpaned.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkhscale.h b/gtk/deprecated/gtkhscale.h
index 486a31f..c9b9a0f 100644
--- a/gtk/deprecated/gtkhscale.h
+++ b/gtk/deprecated/gtkhscale.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_HSCALE_H__
+#define __GTK_HSCALE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_HSCALE_H__
-#define __GTK_HSCALE_H__
-
 #include <gtk/gtkscale.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkhscrollbar.h b/gtk/deprecated/gtkhscrollbar.h
index c325c3c..aa7253b 100644
--- a/gtk/deprecated/gtkhscrollbar.h
+++ b/gtk/deprecated/gtkhscrollbar.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_HSCROLLBAR_H__
+#define __GTK_HSCROLLBAR_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_HSCROLLBAR_H__
-#define __GTK_HSCROLLBAR_H__
-
 #include <gtk/gtkscrollbar.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkhseparator.h b/gtk/deprecated/gtkhseparator.h
index f9bdaa9..e58fb4e 100644
--- a/gtk/deprecated/gtkhseparator.h
+++ b/gtk/deprecated/gtkhseparator.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_HSEPARATOR_H__
+#define __GTK_HSEPARATOR_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_HSEPARATOR_H__
-#define __GTK_HSEPARATOR_H__
-
 #include <gtk/gtkseparator.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkhsv.h b/gtk/deprecated/gtkhsv.h
index 9f9436c..b25f20b 100644
--- a/gtk/deprecated/gtkhsv.h
+++ b/gtk/deprecated/gtkhsv.h
@@ -27,13 +27,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_HSV_H__
+#define __GTK_HSV_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_HSV_H__
-#define __GTK_HSV_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkrc.h b/gtk/deprecated/gtkrc.h
index 2f19183..da913f4 100644
--- a/gtk/deprecated/gtkrc.h
+++ b/gtk/deprecated/gtkrc.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_RC_H__
+#define __GTK_RC_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_RC_H__
-#define __GTK_RC_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkstyle.h b/gtk/deprecated/gtkstyle.h
index 1dd7100..0779f32 100644
--- a/gtk/deprecated/gtkstyle.h
+++ b/gtk/deprecated/gtkstyle.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_STYLE_H__
 #define __GTK_STYLE_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
 #include <gtk/gtktypes.h>
diff --git a/gtk/deprecated/gtksymboliccolor.h b/gtk/deprecated/gtksymboliccolor.h
index 937f935..c109ca9 100644
--- a/gtk/deprecated/gtksymboliccolor.h
+++ b/gtk/deprecated/gtksymboliccolor.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_SYMBOLIC_COLOR_H__
+#define __GTK_SYMBOLIC_COLOR_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_SYMBOLIC_COLOR_H__
-#define __GTK_SYMBOLIC_COLOR_H__
-
 #include <gdk/gdk.h>
 #include <gtk/gtkstyleproperties.h>
 
diff --git a/gtk/deprecated/gtktable.h b/gtk/deprecated/gtktable.h
index bb53c7b..021b215 100644
--- a/gtk/deprecated/gtktable.h
+++ b/gtk/deprecated/gtktable.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_TABLE_H__
+#define __GTK_TABLE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TABLE_H__
-#define __GTK_TABLE_H__
-
 #include <gtk/gtkcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtktearoffmenuitem.h b/gtk/deprecated/gtktearoffmenuitem.h
index d20ea07..224f088 100644
--- a/gtk/deprecated/gtktearoffmenuitem.h
+++ b/gtk/deprecated/gtktearoffmenuitem.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_TEAROFF_MENU_ITEM_H__
+#define __GTK_TEAROFF_MENU_ITEM_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TEAROFF_MENU_ITEM_H__
-#define __GTK_TEAROFF_MENU_ITEM_H__
-
 #include <gtk/gtkmenuitem.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkvbbox.h b/gtk/deprecated/gtkvbbox.h
index 04e64d1..93e461f 100644
--- a/gtk/deprecated/gtkvbbox.h
+++ b/gtk/deprecated/gtkvbbox.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_VBBOX_H__
+#define __GTK_VBBOX_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_VBBOX_H__
-#define __GTK_VBBOX_H__
-
 #include <gtk/gtkbbox.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkvbox.h b/gtk/deprecated/gtkvbox.h
index 1dcc2a8..ae3759b 100644
--- a/gtk/deprecated/gtkvbox.h
+++ b/gtk/deprecated/gtkvbox.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_VBOX_H__
+#define __GTK_VBOX_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_VBOX_H__
-#define __GTK_VBOX_H__
-
 #include <gtk/gtkbox.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkvpaned.h b/gtk/deprecated/gtkvpaned.h
index bc54966..eb9f7d5 100644
--- a/gtk/deprecated/gtkvpaned.h
+++ b/gtk/deprecated/gtkvpaned.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_VPANED_H__
+#define __GTK_VPANED_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_VPANED_H__
-#define __GTK_VPANED_H__
-
 #include <gtk/gtkpaned.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkvscale.h b/gtk/deprecated/gtkvscale.h
index 8d191c0..cff8db8 100644
--- a/gtk/deprecated/gtkvscale.h
+++ b/gtk/deprecated/gtkvscale.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_VSCALE_H__
+#define __GTK_VSCALE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_VSCALE_H__
-#define __GTK_VSCALE_H__
-
 #include <gtk/gtkscale.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkvscrollbar.h b/gtk/deprecated/gtkvscrollbar.h
index 8f641a9..4c485d2 100644
--- a/gtk/deprecated/gtkvscrollbar.h
+++ b/gtk/deprecated/gtkvscrollbar.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_VSCROLLBAR_H__
+#define __GTK_VSCROLLBAR_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_VSCROLLBAR_H__
-#define __GTK_VSCROLLBAR_H__
-
 #include <gtk/gtkscrollbar.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkvseparator.h b/gtk/deprecated/gtkvseparator.h
index f0f4451..d96b028 100644
--- a/gtk/deprecated/gtkvseparator.h
+++ b/gtk/deprecated/gtkvseparator.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_VSEPARATOR_H__
+#define __GTK_VSEPARATOR_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_VSEPARATOR_H__
-#define __GTK_VSEPARATOR_H__
-
 #include <gtk/gtkseparator.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h
index eae37f3..fd96ae2 100644
--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@@ -20,13 +20,13 @@
    Author: Anders Carlsson <andersca@codefactory.se>
 */
 
+#ifndef __GTK_ABOUT_DIALOG_H__
+#define __GTK_ABOUT_DIALOG_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ABOUT_DIALOG_H__
-#define __GTK_ABOUT_DIALOG_H__
-
 #include <gtk/gtkdialog.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index 6274a44..fe8b1f7 100644
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_ACCEL_GROUP_H__
 #define __GTK_ACCEL_GROUP_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
 
diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h
index bf247f1..f7b6084 100644
--- a/gtk/gtkaccellabel.h
+++ b/gtk/gtkaccellabel.h
@@ -25,14 +25,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_ACCEL_LABEL_H__
 #define __GTK_ACCEL_LABEL_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtklabel.h>
 
 
diff --git a/gtk/gtkaccelmap.h b/gtk/gtkaccelmap.h
index e77fb83..8612f18 100644
--- a/gtk/gtkaccelmap.h
+++ b/gtk/gtkaccelmap.h
@@ -15,14 +15,14 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_ACCEL_MAP_H__
 #define __GTK_ACCEL_MAP_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkaccelgroup.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkaccelmapprivate.h b/gtk/gtkaccelmapprivate.h
index 6f5b027..e825dd3 100644
--- a/gtk/gtkaccelmapprivate.h
+++ b/gtk/gtkaccelmapprivate.h
@@ -15,14 +15,14 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_ACCEL_MAP_PRIVATE_H__
 #define __GTK_ACCEL_MAP_PRIVATE_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkaccelmap.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h
index 5479224..3f17108 100644
--- a/gtk/gtkaccessible.h
+++ b/gtk/gtkaccessible.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_ACCESSIBLE_H__
+#define __GTK_ACCESSIBLE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ACCESSIBLE_H__
-#define __GTK_ACCESSIBLE_H__
-
 #include <atk/atk.h>
 #include <gtk/gtkwidget.h>
 
diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index 944fb29..1cac38f 100644
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -26,13 +26,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_ACTION_H__
+#define __GTK_ACTION_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ACTION_H__
-#define __GTK_ACTION_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 97ac903..94a3782 100644
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -26,13 +26,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_ACTION_GROUP_H__
+#define __GTK_ACTION_GROUP_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ACTION_GROUP_H__
-#define __GTK_ACTION_GROUP_H__
-
 #include <gtk/gtkaction.h>
 #include <gtk/gtkstock.h>
 
diff --git a/gtk/gtkactivatable.h b/gtk/gtkactivatable.h
index 6b13c17..4ff90f8 100644
--- a/gtk/gtkactivatable.h
+++ b/gtk/gtkactivatable.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_ACTIVATABLE_H__
+#define __GTK_ACTIVATABLE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ACTIVATABLE_H__
-#define __GTK_ACTIVATABLE_H__
-
 #include <gtk/gtkaction.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index 8af9685..ebb6c4c 100644
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_ADJUSTMENT_H__
+#define __GTK_ADJUSTMENT_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ADJUSTMENT_H__
-#define __GTK_ADJUSTMENT_H__
-
 #include <gdk/gdk.h>
 #include <gtk/gtktypes.h>
 
diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h
index 9720cbc..50a5dc4 100644
--- a/gtk/gtkalignment.h
+++ b/gtk/gtkalignment.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_ALIGNMENT_H__
 #define __GTK_ALIGNMENT_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbin.h>
 
 
diff --git a/gtk/gtkappchooser.h b/gtk/gtkappchooser.h
index 29143e8..33d18aa 100644
--- a/gtk/gtkappchooser.h
+++ b/gtk/gtkappchooser.h
@@ -19,13 +19,13 @@
  * Authors: Cosimo Cecchi <ccecchi@redhat.com>
  */
 
+#ifndef __GTK_APP_CHOOSER_H__
+#define __GTK_APP_CHOOSER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_APP_CHOOSER_H__
-#define __GTK_APP_CHOOSER_H__
-
 #include <glib.h>
 #include <gio/gio.h>
 
diff --git a/gtk/gtkappchooserbutton.h b/gtk/gtkappchooserbutton.h
index fae9800..9d66be8 100644
--- a/gtk/gtkappchooserbutton.h
+++ b/gtk/gtkappchooserbutton.h
@@ -19,13 +19,13 @@
  * Authors: Cosimo Cecchi <ccecchi@redhat.com>
  */
 
+#ifndef __GTK_APP_CHOOSER_BUTTON_H__
+#define __GTK_APP_CHOOSER_BUTTON_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_APP_CHOOSER_BUTTON_H__
-#define __GTK_APP_CHOOSER_BUTTON_H__
-
 #include <gtk/gtkcombobox.h>
 #include <gio/gio.h>
 
diff --git a/gtk/gtkappchooserdialog.h b/gtk/gtkappchooserdialog.h
index 1958ec3..c1dcda3 100644
--- a/gtk/gtkappchooserdialog.h
+++ b/gtk/gtkappchooserdialog.h
@@ -22,13 +22,13 @@
  *          Cosimo Cecchi <ccecchi@redhat.com>
  */
 
+#ifndef __GTK_APP_CHOOSER_DIALOG_H__
+#define __GTK_APP_CHOOSER_DIALOG_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_APP_CHOOSER_DIALOG_H__
-#define __GTK_APP_CHOOSER_DIALOG_H__
-
 #include <gtk/gtkdialog.h>
 #include <gio/gio.h>
 
diff --git a/gtk/gtkappchooserwidget.h b/gtk/gtkappchooserwidget.h
index a80555e..9434207 100644
--- a/gtk/gtkappchooserwidget.h
+++ b/gtk/gtkappchooserwidget.h
@@ -22,13 +22,13 @@
  *          Cosimo Cecchi <ccecchi@redhat.com>
  */
 
+#ifndef __GTK_APP_CHOOSER_WIDGET_H__
+#define __GTK_APP_CHOOSER_WIDGET_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_APP_CHOOSER_WIDGET_H__
-#define __GTK_APP_CHOOSER_WIDGET_H__
-
 #include <gtk/gtkbox.h>
 #include <gtk/gtkmenu.h>
 #include <gio/gio.h>
diff --git a/gtk/gtkapplication.h b/gtk/gtkapplication.h
index d354562..7a6f8c2 100644
--- a/gtk/gtkapplication.h
+++ b/gtk/gtkapplication.h
@@ -17,13 +17,13 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __GTK_APPLICATION_H__
+#define __GTK_APPLICATION_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_APPLICATION_H__
-#define __GTK_APPLICATION_H__
-
 #include <gtk/gtkwidget.h>
 #include <gio/gio.h>
 
diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h
index 009e2c1..0ab1bf8 100644
--- a/gtk/gtkarrow.h
+++ b/gtk/gtkarrow.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_ARROW_H__
 #define __GTK_ARROW_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkmisc.h>
 
 
diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
index 5585561..c79f211 100644
--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_ASPECT_FRAME_H__
 #define __GTK_ASPECT_FRAME_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkframe.h>
 
 
diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h
index 03764af..8ac451b 100644
--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_ASSISTANT_H__
+#define __GTK_ASSISTANT_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ASSISTANT_H__
-#define __GTK_ASSISTANT_H__
-
 #include <gtk/gtkwindow.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h
index 46e488a..812f516 100644
--- a/gtk/gtkbbox.h
+++ b/gtk/gtkbbox.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_BUTTON_BOX_H__
+#define __GTK_BUTTON_BOX_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_BUTTON_BOX_H__
-#define __GTK_BUTTON_BOX_H__
-
 #include <gtk/gtkbox.h>
 
 
diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h
index 6d96576..1ec0fa3 100644
--- a/gtk/gtkbin.h
+++ b/gtk/gtkbin.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_BIN_H__
 #define __GTK_BIN_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcontainer.h>
 
 
diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
index 4d23ed7..fb911f7 100644
--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@@ -25,14 +25,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_BINDINGS_H__
 #define __GTK_BINDINGS_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
 
diff --git a/gtk/gtkborder.h b/gtk/gtkborder.h
index 1243e81..8b700ef 100644
--- a/gtk/gtkborder.h
+++ b/gtk/gtkborder.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_BORDER_H__
+#define __GTK_BORDER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_BORDER_H__
-#define __GTK_BORDER_H__
-
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 3f80117..d51ccf0 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_BOX_H__
 #define __GTK_BOX_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcontainer.h>
 
 
diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index 2a1f65e..f9809a1 100644
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_BUILDABLE_H__
+#define __GTK_BUILDABLE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_BUILDABLE_H__
-#define __GTK_BUILDABLE_H__
-
 #include <gtk/gtkbuilder.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h
index 60b358a..f62cf69 100644
--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_BUILDER_H__
+#define __GTK_BUILDER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_BUILDER_H__
-#define __GTK_BUILDER_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index 9166db0..d46f181 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_BUTTON_H__
 #define __GTK_BUTTON_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbin.h>
 #include <gtk/gtkimage.h>
 
diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h
index 8d745fa..7745c62 100644
--- a/gtk/gtkcalendar.h
+++ b/gtk/gtkcalendar.h
@@ -25,14 +25,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_CALENDAR_H__
 #define __GTK_CALENDAR_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkwidget.h>
 
 
diff --git a/gtk/gtkcellarea.h b/gtk/gtkcellarea.h
index 23fd02b..0f45837 100644
--- a/gtk/gtkcellarea.h
+++ b/gtk/gtkcellarea.h
@@ -19,13 +19,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_CELL_AREA_H__
+#define __GTK_CELL_AREA_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_AREA_H__
-#define __GTK_CELL_AREA_H__
-
 #include <gtk/gtkcellrenderer.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtktreemodel.h>
diff --git a/gtk/gtkcellareabox.h b/gtk/gtkcellareabox.h
index 5deccd9..854faa0 100644
--- a/gtk/gtkcellareabox.h
+++ b/gtk/gtkcellareabox.h
@@ -19,13 +19,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_CELL_AREA_BOX_H__
+#define __GTK_CELL_AREA_BOX_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_AREA_BOX_H__
-#define __GTK_CELL_AREA_BOX_H__
-
 #include <gtk/gtkcellarea.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcellareaboxcontextprivate.h b/gtk/gtkcellareaboxcontextprivate.h
index 836e3e1..5feb7e6 100644
--- a/gtk/gtkcellareaboxcontextprivate.h
+++ b/gtk/gtkcellareaboxcontextprivate.h
@@ -19,13 +19,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_CELL_AREA_BOX_CONTEXT_H__
+#define __GTK_CELL_AREA_BOX_CONTEXT_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_AREA_BOX_CONTEXT_H__
-#define __GTK_CELL_AREA_BOX_CONTEXT_H__
-
 #include <gtk/gtkcellareacontext.h>
 #include <gtk/gtkcellareabox.h>
 #include <gtk/gtkcellrenderer.h>
diff --git a/gtk/gtkcellareacontext.h b/gtk/gtkcellareacontext.h
index 7daca08..c42aba7 100644
--- a/gtk/gtkcellareacontext.h
+++ b/gtk/gtkcellareacontext.h
@@ -19,13 +19,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_CELL_AREA_CONTEXT_H__
+#define __GTK_CELL_AREA_CONTEXT_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_AREA_CONTEXT_H__
-#define __GTK_CELL_AREA_CONTEXT_H__
-
 #include <gtk/gtkcellarea.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcelleditable.h b/gtk/gtkcelleditable.h
index 7cd3fbf..ae97d9a 100644
--- a/gtk/gtkcelleditable.h
+++ b/gtk/gtkcelleditable.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_CELL_EDITABLE_H__
+#define __GTK_CELL_EDITABLE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_EDITABLE_H__
-#define __GTK_CELL_EDITABLE_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcelllayout.h b/gtk/gtkcelllayout.h
index 28dfcaa..8870c67 100644
--- a/gtk/gtkcelllayout.h
+++ b/gtk/gtkcelllayout.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_CELL_LAYOUT_H__
+#define __GTK_CELL_LAYOUT_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_LAYOUT_H__
-#define __GTK_CELL_LAYOUT_H__
-
 #include <gtk/gtkcellrenderer.h>
 #include <gtk/gtkcellarea.h>
 #include <gtk/gtkbuildable.h>
diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index dc8263e..3eee308 100644
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_CELL_RENDERER_H__
+#define __GTK_CELL_RENDERER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_RENDERER_H__
-#define __GTK_CELL_RENDERER_H__
-
 #include <gtk/gtkcelleditable.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcellrendereraccel.h b/gtk/gtkcellrendereraccel.h
index a4fe49c..80391d7 100644
--- a/gtk/gtkcellrendereraccel.h
+++ b/gtk/gtkcellrendereraccel.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_CELL_RENDERER_ACCEL_H__
+#define __GTK_CELL_RENDERER_ACCEL_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_RENDERER_ACCEL_H__
-#define __GTK_CELL_RENDERER_ACCEL_H__
-
 #include <gtk/gtkcellrenderertext.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcellrenderercombo.h b/gtk/gtkcellrenderercombo.h
index acbbbf4..52e87eb 100644
--- a/gtk/gtkcellrenderercombo.h
+++ b/gtk/gtkcellrenderercombo.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_CELL_RENDERER_COMBO_H__
+#define __GTK_CELL_RENDERER_COMBO_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_RENDERER_COMBO_H__
-#define __GTK_CELL_RENDERER_COMBO_H__
-
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkcellrenderertext.h>
 
diff --git a/gtk/gtkcellrendererpixbuf.h b/gtk/gtkcellrendererpixbuf.h
index 3417b4d..0a7a4f6 100644
--- a/gtk/gtkcellrendererpixbuf.h
+++ b/gtk/gtkcellrendererpixbuf.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_CELL_RENDERER_PIXBUF_H__
+#define __GTK_CELL_RENDERER_PIXBUF_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_RENDERER_PIXBUF_H__
-#define __GTK_CELL_RENDERER_PIXBUF_H__
-
 #include <gtk/gtkcellrenderer.h>
 
 
diff --git a/gtk/gtkcellrendererprogress.h b/gtk/gtkcellrendererprogress.h
index 809d062..ab728bf 100644
--- a/gtk/gtkcellrendererprogress.h
+++ b/gtk/gtkcellrendererprogress.h
@@ -23,13 +23,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_CELL_RENDERER_PROGRESS_H__
+#define __GTK_CELL_RENDERER_PROGRESS_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_RENDERER_PROGRESS_H__
-#define __GTK_CELL_RENDERER_PROGRESS_H__
-
 #include <gtk/gtkcellrenderer.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcellrendererspin.h b/gtk/gtkcellrendererspin.h
index 56e3bc7..dc949b8 100644
--- a/gtk/gtkcellrendererspin.h
+++ b/gtk/gtkcellrendererspin.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_CELL_RENDERER_SPIN_H__
+#define __GTK_CELL_RENDERER_SPIN_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_RENDERER_SPIN_H__
-#define __GTK_CELL_RENDERER_SPIN_H__
-
 #include <gtk/gtkcellrenderertext.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcellrendererspinner.h b/gtk/gtkcellrendererspinner.h
index 7ce0a80..3d2d01f 100644
--- a/gtk/gtkcellrendererspinner.h
+++ b/gtk/gtkcellrendererspinner.h
@@ -18,13 +18,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_CELL_RENDERER_SPINNER_H__
+#define __GTK_CELL_RENDERER_SPINNER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_RENDERER_SPINNER_H__
-#define __GTK_CELL_RENDERER_SPINNER_H__
-
 #include <gtk/gtkcellrenderer.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h
index 82c94df..571e90d 100644
--- a/gtk/gtkcellrenderertext.h
+++ b/gtk/gtkcellrenderertext.h
@@ -15,14 +15,14 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_CELL_RENDERER_TEXT_H__
 #define __GTK_CELL_RENDERER_TEXT_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcellrenderer.h>
 
 
diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h
index dd26c74..9f036e4 100644
--- a/gtk/gtkcellrenderertoggle.h
+++ b/gtk/gtkcellrenderertoggle.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_CELL_RENDERER_TOGGLE_H__
+#define __GTK_CELL_RENDERER_TOGGLE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_RENDERER_TOGGLE_H__
-#define __GTK_CELL_RENDERER_TOGGLE_H__
-
 #include <gtk/gtkcellrenderer.h>
 
 
diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h
index 3a02b02..82e956e 100644
--- a/gtk/gtkcellview.h
+++ b/gtk/gtkcellview.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_CELL_VIEW_H__
+#define __GTK_CELL_VIEW_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CELL_VIEW_H__
-#define __GTK_CELL_VIEW_H__
-
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkcellrenderer.h>
 #include <gtk/gtkcellarea.h>
diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h
index cf33b68..c9b5880 100644
--- a/gtk/gtkcheckbutton.h
+++ b/gtk/gtkcheckbutton.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_CHECK_BUTTON_H__
 #define __GTK_CHECK_BUTTON_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtktogglebutton.h>
 
 
diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h
index 0a2fe64..c793bcd 100644
--- a/gtk/gtkcheckmenuitem.h
+++ b/gtk/gtkcheckmenuitem.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_CHECK_MENU_ITEM_H__
 #define __GTK_CHECK_MENU_ITEM_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkmenuitem.h>
 
 
diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h
index d47dba1..b04eea4 100644
--- a/gtk/gtkclipboard.h
+++ b/gtk/gtkclipboard.h
@@ -17,13 +17,13 @@
  * Global clipboard abstraction.
  */
 
+#ifndef __GTK_CLIPBOARD_H__
+#define __GTK_CLIPBOARD_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_CLIPBOARD_H__
-#define __GTK_CLIPBOARD_H__
-
 #include <gtk/gtkselection.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h
index 3dd7f39..6fc7f46 100644
--- a/gtk/gtkcolorbutton.h
+++ b/gtk/gtkcolorbutton.h
@@ -27,14 +27,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_COLOR_BUTTON_H__
 #define __GTK_COLOR_BUTTON_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbutton.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcolorchooser.h b/gtk/gtkcolorchooser.h
index 6d3a891..1921895 100644
--- a/gtk/gtkcolorchooser.h
+++ b/gtk/gtkcolorchooser.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_COLOR_CHOOSER_H__
+#define __GTK_COLOR_CHOOSER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COLOR_CHOOSER_H__
-#define __GTK_COLOR_CHOOSER_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcolorchooserdialog.h b/gtk/gtkcolorchooserdialog.h
index 9d65643..7288bed 100644
--- a/gtk/gtkcolorchooserdialog.h
+++ b/gtk/gtkcolorchooserdialog.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_COLOR_CHOOSER_DIALOG_H__
+#define __GTK_COLOR_CHOOSER_DIALOG_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COLOR_CHOOSER_DIALOG_H__
-#define __GTK_COLOR_CHOOSER_DIALOG_H__
-
 #include <gtk/gtkdialog.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcolorchooserwidget.h b/gtk/gtkcolorchooserwidget.h
index beecc78..f47bc30 100644
--- a/gtk/gtkcolorchooserwidget.h
+++ b/gtk/gtkcolorchooserwidget.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_COLOR_CHOOSER_WIDGET_H__
+#define __GTK_COLOR_CHOOSER_WIDGET_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COLOR_CHOOSER_WIDGET_H__
-#define __GTK_COLOR_CHOOSER_WIDGET_H__
-
 #include <gtk/gtkbox.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcoloreditorprivate.h b/gtk/gtkcoloreditorprivate.h
index 8307028..51a3123 100644
--- a/gtk/gtkcoloreditorprivate.h
+++ b/gtk/gtkcoloreditorprivate.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_COLOR_EDITOR_H__
+#define __GTK_COLOR_EDITOR_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COLOR_EDITOR_H__
-#define __GTK_COLOR_EDITOR_H__
-
 #include <gtk/gtkbox.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcolorplaneprivate.h b/gtk/gtkcolorplaneprivate.h
index b9c372e..01c1ddb 100644
--- a/gtk/gtkcolorplaneprivate.h
+++ b/gtk/gtkcolorplaneprivate.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_COLOR_PLANE_H__
+#define __GTK_COLOR_PLANE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COLOR_PLANE_H__
-#define __GTK_COLOR_PLANE_H__
-
 #include <gtk/gtkdrawingarea.h>
 #include <gtk/gtktypes.h>
 
diff --git a/gtk/gtkcolorscaleprivate.h b/gtk/gtkcolorscaleprivate.h
index 5d3b5d2..1b843f3 100644
--- a/gtk/gtkcolorscaleprivate.h
+++ b/gtk/gtkcolorscaleprivate.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_COLOR_SCALE_H__
+#define __GTK_COLOR_SCALE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COLOR_SCALE_H__
-#define __GTK_COLOR_SCALE_H__
-
 #include <gtk/gtkscale.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcolorswatchprivate.h b/gtk/gtkcolorswatchprivate.h
index e43ac2c..67ed175 100644
--- a/gtk/gtkcolorswatchprivate.h
+++ b/gtk/gtkcolorswatchprivate.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_COLOR_SWATCH_H__
+#define __GTK_COLOR_SWATCH_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COLOR_SWATCH_H__
-#define __GTK_COLOR_SWATCH_H__
-
 #include <gtk/gtkdrawingarea.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcolorutils.h b/gtk/gtkcolorutils.h
index 8fdef92..8cb8c21 100644
--- a/gtk/gtkcolorutils.h
+++ b/gtk/gtkcolorutils.h
@@ -27,13 +27,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_COLOR_UTILS_H__
+#define __GTK_COLOR_UTILS_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COLOR_UTILS_H__
-#define __GTK_COLOR_UTILS_H__
-
 #include <glib.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index 8378d2d..03d25ff 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_COMBO_BOX_H__
+#define __GTK_COMBO_BOX_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COMBO_BOX_H__
-#define __GTK_COMBO_BOX_H__
-
 #include <gtk/gtkbin.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreeview.h>
diff --git a/gtk/gtkcomboboxtext.h b/gtk/gtkcomboboxtext.h
index d1c362f..c31c9c2 100644
--- a/gtk/gtkcomboboxtext.h
+++ b/gtk/gtkcomboboxtext.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_COMBO_BOX_TEXT_H__
+#define __GTK_COMBO_BOX_TEXT_H__
+
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COMBO_BOX_TEXT_H__
-#define __GTK_COMBO_BOX_TEXT_H__
-
 #include <gtk/gtkcombobox.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 2db2488..3bcd2b1 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_CONTAINER_H__
 #define __GTK_CONTAINER_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkwidget.h>
 
 
diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
index 1eed41a..ecc9a70 100644
--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_DEBUG_H__
+#define __GTK_DEBUG_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_DEBUG_H__
-#define __GTK_DEBUG_H__
-
 #include <glib.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index d73aef7..1d941c7 100644
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_DIALOG_H__
 #define __GTK_DIALOG_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkwindow.h>
 
 
diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index 4eaa056..3a2b4c2 100644
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -23,14 +23,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_DND_H__
 #define __GTK_DND_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkselection.h>
 
diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h
index 1029b24..b617fda 100644
--- a/gtk/gtkdrawingarea.h
+++ b/gtk/gtkdrawingarea.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_DRAWING_AREA_H__
 #define __GTK_DRAWING_AREA_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkwidget.h>
 
 
diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h
index 15758db..0e2441c 100644
--- a/gtk/gtkeditable.h
+++ b/gtk/gtkeditable.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_EDITABLE_H__
 #define __GTK_EDITABLE_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkwidget.h>
 
 
diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index 50ca934..425547f 100644
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -26,14 +26,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_ENTRY_H__
 #define __GTK_ENTRY_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkeditable.h>
 #include <gtk/gtkimcontext.h>
 #include <gtk/gtkmenu.h>
diff --git a/gtk/gtkentrybuffer.h b/gtk/gtkentrybuffer.h
index 04570b7..8cf5a60 100644
--- a/gtk/gtkentrybuffer.h
+++ b/gtk/gtkentrybuffer.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_ENTRY_BUFFER_H__
+#define __GTK_ENTRY_BUFFER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ENTRY_BUFFER_H__
-#define __GTK_ENTRY_BUFFER_H__
-
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h
index 726685c..b0f19c8 100644
--- a/gtk/gtkentrycompletion.h
+++ b/gtk/gtkentrycompletion.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_ENTRY_COMPLETION_H__
+#define __GTK_ENTRY_COMPLETION_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ENTRY_COMPLETION_H__
-#define __GTK_ENTRY_COMPLETION_H__
-
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtkcellarea.h>
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index 6a33963..cadf80d 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_ENUMS_H__
+#define __GTK_ENUMS_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ENUMS_H__
-#define __GTK_ENUMS_H__
-
 #include <glib-object.h>
 
 
diff --git a/gtk/gtkeventbox.h b/gtk/gtkeventbox.h
index adada8c..36c2a16 100644
--- a/gtk/gtkeventbox.h
+++ b/gtk/gtkeventbox.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_EVENT_BOX_H__
 #define __GTK_EVENT_BOX_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbin.h>
 
 
diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h
index a9ca742..2f9c7b1 100644
--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@@ -19,13 +19,13 @@
  *	Mark McLoughlin <mark@skynet.ie>
  */
 
+#ifndef __GTK_EXPANDER_H__
+#define __GTK_EXPANDER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_EXPANDER_H__
-#define __GTK_EXPANDER_H__
-
 #include <gtk/gtkbin.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkfilechooser.h b/gtk/gtkfilechooser.h
index 6e7d416..6ff9f08 100644
--- a/gtk/gtkfilechooser.h
+++ b/gtk/gtkfilechooser.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_FILE_CHOOSER_H__
+#define __GTK_FILE_CHOOSER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_FILE_CHOOSER_H__
-#define __GTK_FILE_CHOOSER_H__
-
 #include <gtk/gtkfilefilter.h>
 #include <gtk/gtkwidget.h>
 
diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h
index ae02a76..2caadf3 100644
--- a/gtk/gtkfilechooserbutton.h
+++ b/gtk/gtkfilechooserbutton.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_FILE_CHOOSER_BUTTON_H__
+#define __GTK_FILE_CHOOSER_BUTTON_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_FILE_CHOOSER_BUTTON_H__
-#define __GTK_FILE_CHOOSER_BUTTON_H__
-
 #include <gtk/gtkbox.h>
 #include <gtk/gtkfilechooser.h>
 
diff --git a/gtk/gtkfilechooserdialog.h b/gtk/gtkfilechooserdialog.h
index 1b5ec12..6ce77e8 100644
--- a/gtk/gtkfilechooserdialog.h
+++ b/gtk/gtkfilechooserdialog.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_FILE_CHOOSER_DIALOG_H__
+#define __GTK_FILE_CHOOSER_DIALOG_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_FILE_CHOOSER_DIALOG_H__
-#define __GTK_FILE_CHOOSER_DIALOG_H__
-
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkfilechooser.h>
 
diff --git a/gtk/gtkfilechooserwidget.h b/gtk/gtkfilechooserwidget.h
index 841567c..00b55cb 100644
--- a/gtk/gtkfilechooserwidget.h
+++ b/gtk/gtkfilechooserwidget.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_FILE_CHOOSER_WIDGET_H__
+#define __GTK_FILE_CHOOSER_WIDGET_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_FILE_CHOOSER_WIDGET_H__
-#define __GTK_FILE_CHOOSER_WIDGET_H__
-
 #include <gtk/gtkfilechooser.h>
 #include <gtk/gtkbox.h>
 
diff --git a/gtk/gtkfilefilter.h b/gtk/gtkfilefilter.h
index b7c6c68..ab952de 100644
--- a/gtk/gtkfilefilter.h
+++ b/gtk/gtkfilefilter.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_FILE_FILTER_H__
+#define __GTK_FILE_FILTER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_FILE_FILTER_H__
-#define __GTK_FILE_FILTER_H__
-
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h
index 50a00ce..c7746bd 100644
--- a/gtk/gtkfixed.h
+++ b/gtk/gtkfixed.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_FIXED_H__
 #define __GTK_FIXED_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcontainer.h>
 
 
diff --git a/gtk/gtkfontbutton.h b/gtk/gtkfontbutton.h
index 5175498..e511281 100644
--- a/gtk/gtkfontbutton.h
+++ b/gtk/gtkfontbutton.h
@@ -23,13 +23,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_FONT_BUTTON_H__
+#define __GTK_FONT_BUTTON_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_FONT_BUTTON_H__
-#define __GTK_FONT_BUTTON_H__
-
 #include <gtk/gtkbutton.h>
 
 
diff --git a/gtk/gtkfontchooser.h b/gtk/gtkfontchooser.h
index f91667c..1c1bbf0 100644
--- a/gtk/gtkfontchooser.h
+++ b/gtk/gtkfontchooser.h
@@ -18,13 +18,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_FONT_CHOOSER_H__
+#define __GTK_FONT_CHOOSER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_FONT_CHOOSER_H__
-#define __GTK_FONT_CHOOSER_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkfontchooserdialog.h b/gtk/gtkfontchooserdialog.h
index ad8d7c7..d4a18e5 100644
--- a/gtk/gtkfontchooserdialog.h
+++ b/gtk/gtkfontchooserdialog.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_FONT_CHOOSER_DIALOG_H__
+#define __GTK_FONT_CHOOSER_DIALOG_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_FONT_CHOOSER_DIALOG_H__
-#define __GTK_FONT_CHOOSER_DIALOG_H__
-
 #include <gtk/gtkdialog.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkfontchooserwidget.h b/gtk/gtkfontchooserwidget.h
index c998085..662f932 100644
--- a/gtk/gtkfontchooserwidget.h
+++ b/gtk/gtkfontchooserwidget.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_FONT_CHOOSER_WIDGET_H__
+#define __GTK_FONT_CHOOSER_WIDGET_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_FONT_CHOOSER_WIDGET_H__
-#define __GTK_FONT_CHOOSER_WIDGET_H__
-
 #include <gtk/gtkbox.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 2d981f0..ffc90c9 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_FRAME_H__
 #define __GTK_FRAME_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbin.h>
 
 
diff --git a/gtk/gtkgrid.h b/gtk/gtkgrid.h
index 0c72d19..0e37277 100644
--- a/gtk/gtkgrid.h
+++ b/gtk/gtkgrid.h
@@ -16,14 +16,14 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_GRID_H__
 #define __GTK_GRID_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcontainer.h>
 
 
diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index 8e49e62..fabf928 100644
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_ICON_FACTORY_H__
+#define __GTK_ICON_FACTORY_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ICON_FACTORY_H__
-#define __GTK_ICON_FACTORY_H__
-
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
 #include <gtk/gtktypes.h>
diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index 3ecae6e..8852110 100644
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_ICON_THEME_H__
+#define __GTK_ICON_THEME_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ICON_THEME_H__
-#define __GTK_ICON_THEME_H__
-
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdk.h>
 #include <gtk/gtkstylecontext.h>
diff --git a/gtk/gtkiconview.h b/gtk/gtkiconview.h
index 554902e..49d796b 100644
--- a/gtk/gtkiconview.h
+++ b/gtk/gtkiconview.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_ICON_VIEW_H__
+#define __GTK_ICON_VIEW_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ICON_VIEW_H__
-#define __GTK_ICON_VIEW_H__
-
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkcellrenderer.h>
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index 6fb4532..023f20c 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_IMAGE_H__
 #define __GTK_IMAGE_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gio/gio.h>
 #include <gtk/gtkmisc.h>
 
diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h
index f53cc68..1c53695 100644
--- a/gtk/gtkimagemenuitem.h
+++ b/gtk/gtkimagemenuitem.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_IMAGE_MENU_ITEM_H__
 #define __GTK_IMAGE_MENU_ITEM_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkmenuitem.h>
 
 
diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h
index 85025d9..55fe53f 100644
--- a/gtk/gtkimcontext.h
+++ b/gtk/gtkimcontext.h
@@ -15,14 +15,14 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_IM_CONTEXT_H__
 #define __GTK_IM_CONTEXT_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gdk/gdk.h>
 
 
diff --git a/gtk/gtkimcontextinfo.h b/gtk/gtkimcontextinfo.h
index 1c3fdae..019b46d 100644
--- a/gtk/gtkimcontextinfo.h
+++ b/gtk/gtkimcontextinfo.h
@@ -15,14 +15,14 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_IM_CONTEXT_INFO_H__
 #define __GTK_IM_CONTEXT_INFO_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <glib.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h
index 03479c8..ddb4679 100644
--- a/gtk/gtkimcontextsimple.h
+++ b/gtk/gtkimcontextsimple.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_IM_CONTEXT_SIMPLE_H__
+#define __GTK_IM_CONTEXT_SIMPLE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_IM_CONTEXT_SIMPLE_H__
-#define __GTK_IM_CONTEXT_SIMPLE_H__
-
 #include <gtk/gtkimcontext.h>
 
 
diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h
index 08779a7..1979bf6 100644
--- a/gtk/gtkimmulticontext.h
+++ b/gtk/gtkimmulticontext.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_IM_MULTICONTEXT_H__
+#define __GTK_IM_MULTICONTEXT_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_IM_MULTICONTEXT_H__
-#define __GTK_IM_MULTICONTEXT_H__
-
 #include <gtk/gtkimcontext.h>
 #include <gtk/gtkmenushell.h>
 
diff --git a/gtk/gtkinfobar.h b/gtk/gtkinfobar.h
index 9a3ca0e..a7e351a 100644
--- a/gtk/gtkinfobar.h
+++ b/gtk/gtkinfobar.h
@@ -26,13 +26,13 @@
  * Modified by the GTK+ Team, 2008-2009.
  */
 
+#ifndef __GTK_INFO_BAR_H__
+#define __GTK_INFO_BAR_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_INFO_BAR_H__
-#define __GTK_INFO_BAR_H__
-
 #include <gtk/gtkbox.h>
 #include <gtk/gtkenums.h>
 
diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h
index c574568..9806da7 100644
--- a/gtk/gtkinvisible.h
+++ b/gtk/gtkinvisible.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_INVISIBLE_H__
+#define __GTK_INVISIBLE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_INVISIBLE_H__
-#define __GTK_INVISIBLE_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 81c9ac8..3d3c27d 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_LABEL_H__
 #define __GTK_LABEL_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkmisc.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkmenu.h>
diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index f5b710e..04dcb51 100644
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -26,14 +26,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_LAYOUT_H__
 #define __GTK_LAYOUT_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcontainer.h>
 
 
diff --git a/gtk/gtklevelbar.h b/gtk/gtklevelbar.h
index 99cc6b7..aab7064 100644
--- a/gtk/gtklevelbar.h
+++ b/gtk/gtklevelbar.h
@@ -18,13 +18,13 @@
  *
  */
 
+#ifndef __GTK_LEVEL_BAR_H__
+#define __GTK_LEVEL_BAR_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_LEVEL_BAR_H__
-#define __GTK_LEVEL_BAR_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h
index 0de6685..71e8707 100644
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_LINK_BUTTON_H__
+#define __GTK_LINK_BUTTON_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_LINK_BUTTON_H__
-#define __GTK_LINK_BUTTON_H__
-
 #include <gtk/gtkbutton.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 568e10c..1e61d5a 100644
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_LIST_STORE_H__
+#define __GTK_LIST_STORE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_LIST_STORE_H__
-#define __GTK_LIST_STORE_H__
-
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
 
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index b2ae0a3..549989a 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_MAIN_H__
 #define __GTK_MAIN_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gdk/gdk.h>
 #include <gtk/gtkwidget.h>
 #ifdef G_PLATFORM_WIN32
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index 1c50ca1..d6843eb 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_MENU_H__
 #define __GTK_MENU_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkaccelgroup.h>
 #include <gtk/gtkmenushell.h>
 
diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h
index 5529ecf..5dc792f 100644
--- a/gtk/gtkmenubar.h
+++ b/gtk/gtkmenubar.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_MENU_BAR_H__
 #define __GTK_MENU_BAR_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkmenushell.h>
 
 
diff --git a/gtk/gtkmenubutton.h b/gtk/gtkmenubutton.h
index 67c67c9..8aa2644 100644
--- a/gtk/gtkmenubutton.h
+++ b/gtk/gtkmenubutton.h
@@ -18,13 +18,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_MENU_BUTTON_H__
+#define __GTK_MENU_BUTTON_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_MENU_BUTTON_H__
-#define __GTK_MENU_BUTTON_H__
-
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkmenu.h>
 
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index e9e6ef2..9d546d6 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_MENU_ITEM_H__
+#define __GTK_MENU_ITEM_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_MENU_ITEM_H__
-#define __GTK_MENU_ITEM_H__
-
 #include <gtk/gtkbin.h>
 
 
diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h
index c0479e8..c3bd879 100644
--- a/gtk/gtkmenushell.h
+++ b/gtk/gtkmenushell.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_MENU_SHELL_H__
 #define __GTK_MENU_SHELL_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcontainer.h>
 
 
diff --git a/gtk/gtkmenutoolbutton.h b/gtk/gtkmenutoolbutton.h
index fb7977b..50ee12e 100644
--- a/gtk/gtkmenutoolbutton.h
+++ b/gtk/gtkmenutoolbutton.h
@@ -17,13 +17,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_MENU_TOOL_BUTTON_H__
+#define __GTK_MENU_TOOL_BUTTON_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_MENU_TOOL_BUTTON_H__
-#define __GTK_MENU_TOOL_BUTTON_H__
-
 #include <gtk/gtkmenu.h>
 #include <gtk/gtktoolbutton.h>
 
diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h
index 5f5d1a9..5d84caa 100644
--- a/gtk/gtkmessagedialog.h
+++ b/gtk/gtkmessagedialog.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_MESSAGE_DIALOG_H__
+#define __GTK_MESSAGE_DIALOG_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_MESSAGE_DIALOG_H__
-#define __GTK_MESSAGE_DIALOG_H__
-
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkenums.h>
 
diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h
index b767dd4..a652a01 100644
--- a/gtk/gtkmisc.h
+++ b/gtk/gtkmisc.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_MISC_H__
 #define __GTK_MISC_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkwidget.h>
 
 
diff --git a/gtk/gtkmodules.h b/gtk/gtkmodules.h
index 594f99e..4aca360 100644
--- a/gtk/gtkmodules.h
+++ b/gtk/gtkmodules.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_MODULES_H__
+#define __GTK_MODULES_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_MODULES_H__
-#define __GTK_MODULES_H__
-
 #include <gdk/gdk.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkmountoperation.h b/gtk/gtkmountoperation.h
index e75561c..cff736e 100644
--- a/gtk/gtkmountoperation.h
+++ b/gtk/gtkmountoperation.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_MOUNT_OPERATION_H__
+#define __GTK_MOUNT_OPERATION_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_MOUNT_OPERATION_H__
-#define __GTK_MOUNT_OPERATION_H__
-
 G_BEGIN_DECLS
 
 #define GTK_TYPE_MOUNT_OPERATION         (gtk_mount_operation_get_type ())
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index 5fa72af..a0fea56 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -23,14 +23,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_NOTEBOOK_H__
 #define __GTK_NOTEBOOK_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcontainer.h>
 
 
diff --git a/gtk/gtknumerableicon.h b/gtk/gtknumerableicon.h
index 850506d..7f4d77a 100644
--- a/gtk/gtknumerableicon.h
+++ b/gtk/gtknumerableicon.h
@@ -19,13 +19,13 @@
  * Authors: Cosimo Cecchi <cosimoc@redhat.com>
  */
 
+#ifndef __GTK_NUMERABLE_ICON_H__
+#define __GTK_NUMERABLE_ICON_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_NUMERABLE_ICON_H__
-#define __GTK_NUMERABLE_ICON_H__
-
 #include <gio/gio.h>
 #include <gtk/gtkstylecontext.h>
 
diff --git a/gtk/gtkoffscreenwindow.h b/gtk/gtkoffscreenwindow.h
index 9b5837a..d4592a0 100644
--- a/gtk/gtkoffscreenwindow.h
+++ b/gtk/gtkoffscreenwindow.h
@@ -16,13 +16,13 @@
  *          Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __GTK_OFFSCREEN_WINDOW_H__
+#define __GTK_OFFSCREEN_WINDOW_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_OFFSCREEN_WINDOW_H__
-#define __GTK_OFFSCREEN_WINDOW_H__
-
 #include <gtk/gtkwindow.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkorientable.h b/gtk/gtkorientable.h
index bdc34d3..2708a45 100644
--- a/gtk/gtkorientable.h
+++ b/gtk/gtkorientable.h
@@ -19,13 +19,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_ORIENTABLE_H__
+#define __GTK_ORIENTABLE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ORIENTABLE_H__
-#define __GTK_ORIENTABLE_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkoverlay.h b/gtk/gtkoverlay.h
index fb186d3..1f8883b 100644
--- a/gtk/gtkoverlay.h
+++ b/gtk/gtkoverlay.h
@@ -18,13 +18,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_OVERLAY_H__
+#define __GTK_OVERLAY_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_OVERLAY_H__
-#define __GTK_OVERLAY_H__
-
 #include <gtk/gtkbin.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h
index cd4607d..86a414e 100644
--- a/gtk/gtkpagesetup.h
+++ b/gtk/gtkpagesetup.h
@@ -16,14 +16,14 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_PAGE_SETUP_H__
 #define __GTK_PAGE_SETUP_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkpapersize.h>
 
 
diff --git a/gtk/gtkpagesetupunixdialog.h b/gtk/gtkpagesetupunixdialog.h
index 137bcd1..7f8ceaf 100644
--- a/gtk/gtkpagesetupunixdialog.h
+++ b/gtk/gtkpagesetupunixdialog.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_PAGE_SETUP_UNIX_DIALOG_H__
+#define __GTK_PAGE_SETUP_UNIX_DIALOG_H__
+
 #if !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtkunixprint.h> can be included directly."
 #endif
 
-#ifndef __GTK_PAGE_SETUP_UNIX_DIALOG_H__
-#define __GTK_PAGE_SETUP_UNIX_DIALOG_H__
-
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h
index 67642a3..55ec32c 100644
--- a/gtk/gtkpaned.h
+++ b/gtk/gtkpaned.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_PANED_H__
+#define __GTK_PANED_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_PANED_H__
-#define __GTK_PANED_H__
-
 #include <gtk/gtkcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h
index f3cfa6e..f7cf20d 100644
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -16,14 +16,14 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_PAPER_SIZE_H__
 #define __GTK_PAPER_SIZE_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkenums.h>
 
 
diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index 60156ce..bd6a393 100644
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_PLUG_H__
+#define __GTK_PLUG_H__
+
 #if !defined (__GTKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtkx.h> can be included directly."
 #endif
 
-#ifndef __GTK_PLUG_H__
-#define __GTK_PLUG_H__
-
 #include <gdk/gdk.h>
 
 #ifdef GDK_WINDOWING_X11
diff --git a/gtk/gtkpressandholdprivate.h b/gtk/gtkpressandholdprivate.h
index ccccca2..4dcc698 100644
--- a/gtk/gtkpressandholdprivate.h
+++ b/gtk/gtkpressandholdprivate.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_PRESS_AND_HOLD_H__
+#define __GTK_PRESS_AND_HOLD_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_PRESS_AND_HOLD_H__
-#define __GTK_PRESS_AND_HOLD_H__
-
 G_BEGIN_DECLS
 
 #define GTK_TYPE_PRESS_AND_HOLD                  (gtk_press_and_hold_get_type ())
diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h
index 561d0c4..aecd8a9 100644
--- a/gtk/gtkprintcontext.h
+++ b/gtk/gtkprintcontext.h
@@ -16,14 +16,14 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_PRINT_CONTEXT_H__
 #define __GTK_PRINT_CONTEXT_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <pango/pango.h>
 #include <gtk/gtkpagesetup.h>
 
diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h
index 4c177ad..2115fd1 100644
--- a/gtk/gtkprinter.h
+++ b/gtk/gtkprinter.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_PRINTER_H__
+#define __GTK_PRINTER_H__
+
 #if !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtkunixprint.h> can be included directly."
 #endif
 
-#ifndef __GTK_PRINTER_H__
-#define __GTK_PRINTER_H__
-
 #include <cairo.h>
 #include <gtk/gtk.h>
 
diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h
index b78ab72..0c19802 100644
--- a/gtk/gtkprintjob.h
+++ b/gtk/gtkprintjob.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_PRINT_JOB_H__
+#define __GTK_PRINT_JOB_H__
+
 #if !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtkunixprint.h> can be included directly."
 #endif
 
-#ifndef __GTK_PRINT_JOB_H__
-#define __GTK_PRINT_JOB_H__
-
 #include <cairo.h>
 
 #include <gtk/gtk.h>
diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index a1e8aec..49a31ce 100644
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -16,14 +16,14 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_PRINT_OPERATION_H__
 #define __GTK_PRINT_OPERATION_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <cairo.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwindow.h>
diff --git a/gtk/gtkprintoperationpreview.h b/gtk/gtkprintoperationpreview.h
index e932e7c..e92376b 100644
--- a/gtk/gtkprintoperationpreview.h
+++ b/gtk/gtkprintoperationpreview.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_PRINT_OPERATION_PREVIEW_H__
+#define __GTK_PRINT_OPERATION_PREVIEW_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_PRINT_OPERATION_PREVIEW_H__
-#define __GTK_PRINT_OPERATION_PREVIEW_H__
-
 #include <cairo.h>
 #include <gtk/gtkprintcontext.h>
 
diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h
index 3323a7b..294dabd 100644
--- a/gtk/gtkprintsettings.h
+++ b/gtk/gtkprintsettings.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_PRINT_SETTINGS_H__
+#define __GTK_PRINT_SETTINGS_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_PRINT_SETTINGS_H__
-#define __GTK_PRINT_SETTINGS_H__
-
 #include <gtk/gtkpapersize.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkprintunixdialog.h b/gtk/gtkprintunixdialog.h
index 8458aac..89e06ab 100644
--- a/gtk/gtkprintunixdialog.h
+++ b/gtk/gtkprintunixdialog.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_PRINT_UNIX_DIALOG_H__
+#define __GTK_PRINT_UNIX_DIALOG_H__
+
 #if !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtkunixprint.h> can be included directly."
 #endif
 
-#ifndef __GTK_PRINT_UNIX_DIALOG_H__
-#define __GTK_PRINT_UNIX_DIALOG_H__
-
 #include <gtk/gtk.h>
 #include <gtk/gtkprinter.h>
 #include <gtk/gtkprintjob.h>
diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index ae07bdc..9ae044b 100644
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_PROGRESS_BAR_H__
+#define __GTK_PROGRESS_BAR_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_PROGRESS_BAR_H__
-#define __GTK_PROGRESS_BAR_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkradioaction.h b/gtk/gtkradioaction.h
index 84eac16..fccdef7 100644
--- a/gtk/gtkradioaction.h
+++ b/gtk/gtkradioaction.h
@@ -26,13 +26,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_RADIO_ACTION_H__
+#define __GTK_RADIO_ACTION_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_RADIO_ACTION_H__
-#define __GTK_RADIO_ACTION_H__
-
 #include <gtk/gtktoggleaction.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h
index 14ad10d..b4121a6 100644
--- a/gtk/gtkradiobutton.h
+++ b/gtk/gtkradiobutton.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_RADIO_BUTTON_H__
 #define __GTK_RADIO_BUTTON_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcheckbutton.h>
 
 
diff --git a/gtk/gtkradiomenuitem.h b/gtk/gtkradiomenuitem.h
index e9e36a5..c365c99 100644
--- a/gtk/gtkradiomenuitem.h
+++ b/gtk/gtkradiomenuitem.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_RADIO_MENU_ITEM_H__
 #define __GTK_RADIO_MENU_ITEM_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcheckmenuitem.h>
 
 
diff --git a/gtk/gtkradiotoolbutton.h b/gtk/gtkradiotoolbutton.h
index 3c5e605..95593fc 100644
--- a/gtk/gtkradiotoolbutton.h
+++ b/gtk/gtkradiotoolbutton.h
@@ -18,13 +18,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_RADIO_TOOL_BUTTON_H__
+#define __GTK_RADIO_TOOL_BUTTON_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_RADIO_TOOL_BUTTON_H__
-#define __GTK_RADIO_TOOL_BUTTON_H__
-
 #include <gtk/gtktoggletoolbutton.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index 99bbb7d..8495cdb 100644
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_RANGE_H__
 #define __GTK_RANGE_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkwidget.h>
 
 
diff --git a/gtk/gtkrecentaction.h b/gtk/gtkrecentaction.h
index 016b587..a0654df 100644
--- a/gtk/gtkrecentaction.h
+++ b/gtk/gtkrecentaction.h
@@ -17,13 +17,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_RECENT_ACTION_H__
+#define __GTK_RECENT_ACTION_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_RECENT_ACTION_H__
-#define __GTK_RECENT_ACTION_H__
-
 #include <gtk/gtkaction.h>
 #include <gtk/gtkrecentmanager.h>
 
diff --git a/gtk/gtkrecentchooser.h b/gtk/gtkrecentchooser.h
index 945dfa0..66626ca 100644
--- a/gtk/gtkrecentchooser.h
+++ b/gtk/gtkrecentchooser.h
@@ -17,13 +17,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_RECENT_CHOOSER_H__
+#define __GTK_RECENT_CHOOSER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_RECENT_CHOOSER_H__
-#define __GTK_RECENT_CHOOSER_H__
-
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkrecentmanager.h>
 #include <gtk/gtkrecentfilter.h>
diff --git a/gtk/gtkrecentchooserdialog.h b/gtk/gtkrecentchooserdialog.h
index 5d950b5..ff557db 100644
--- a/gtk/gtkrecentchooserdialog.h
+++ b/gtk/gtkrecentchooserdialog.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_RECENT_CHOOSER_DIALOG_H__
+#define __GTK_RECENT_CHOOSER_DIALOG_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_RECENT_CHOOSER_DIALOG_H__
-#define __GTK_RECENT_CHOOSER_DIALOG_H__
-
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkrecentchooser.h>
 
diff --git a/gtk/gtkrecentchoosermenu.h b/gtk/gtkrecentchoosermenu.h
index b2a0277..0ce04f1 100644
--- a/gtk/gtkrecentchoosermenu.h
+++ b/gtk/gtkrecentchoosermenu.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_RECENT_CHOOSER_MENU_H__
+#define __GTK_RECENT_CHOOSER_MENU_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_RECENT_CHOOSER_MENU_H__
-#define __GTK_RECENT_CHOOSER_MENU_H__
-
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkrecentchooser.h>
 
diff --git a/gtk/gtkrecentchooserwidget.h b/gtk/gtkrecentchooserwidget.h
index 18a4042..460dd6c 100644
--- a/gtk/gtkrecentchooserwidget.h
+++ b/gtk/gtkrecentchooserwidget.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_RECENT_CHOOSER_WIDGET_H__
+#define __GTK_RECENT_CHOOSER_WIDGET_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_RECENT_CHOOSER_WIDGET_H__
-#define __GTK_RECENT_CHOOSER_WIDGET_H__
-
 #include <gtk/gtkrecentchooser.h>
 #include <gtk/gtkbox.h>
 
diff --git a/gtk/gtkrecentfilter.h b/gtk/gtkrecentfilter.h
index 4f19c9b..3501ca8 100644
--- a/gtk/gtkrecentfilter.h
+++ b/gtk/gtkrecentfilter.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_RECENT_FILTER_H__
+#define __GTK_RECENT_FILTER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_RECENT_FILTER_H__
-#define __GTK_RECENT_FILTER_H__
-
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h
index 893a835..a1d7500 100644
--- a/gtk/gtkrecentmanager.h
+++ b/gtk/gtkrecentmanager.h
@@ -17,13 +17,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_RECENT_MANAGER_H__
+#define __GTK_RECENT_MANAGER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_RECENT_MANAGER_H__
-#define __GTK_RECENT_MANAGER_H__
-
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdk.h>
 #include <time.h>
diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index 51202e3..a54b38e 100644
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_SCALE_H__
 #define __GTK_SCALE_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkrange.h>
 
 
diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h
index 4ba4dc9..7aff9ac 100644
--- a/gtk/gtkscalebutton.h
+++ b/gtk/gtkscalebutton.h
@@ -31,13 +31,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_SCALE_BUTTON_H__
+#define __GTK_SCALE_BUTTON_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_SCALE_BUTTON_H__
-#define __GTK_SCALE_BUTTON_H__
-
 #include <gtk/gtkbutton.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkscrollable.h b/gtk/gtkscrollable.h
index ba68e90..a6e292f 100644
--- a/gtk/gtkscrollable.h
+++ b/gtk/gtkscrollable.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_SCROLLABLE_H__
+#define __GTK_SCROLLABLE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_SCROLLABLE_H__
-#define __GTK_SCROLLABLE_H__
-
 #include <gtk/gtkenums.h>
 #include <gtk/gtktypes.h>
 
diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h
index 51fee71..0050939 100644
--- a/gtk/gtkscrollbar.h
+++ b/gtk/gtkscrollbar.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_SCROLLBAR_H__
 #define __GTK_SCROLLBAR_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkrange.h>
 
 
diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index 780f198..c3fcc63 100644
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_SCROLLED_WINDOW_H__
+#define __GTK_SCROLLED_WINDOW_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_SCROLLED_WINDOW_H__
-#define __GTK_SCROLLED_WINDOW_H__
-
 #include <gtk/gtkbin.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtksearchentry.h b/gtk/gtksearchentry.h
index a861219..7f274ba 100644
--- a/gtk/gtksearchentry.h
+++ b/gtk/gtksearchentry.h
@@ -25,13 +25,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_SEARCH_ENTRY_H__
+#define __GTK_SEARCH_ENTRY_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_SEARCH_ENTRY_H__
-#define __GTK_SEARCH_ENTRY_H__
-
 #include <gtk/gtkentry.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index a86a1ca..66f39ff 100644
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_SELECTION_H__
+#define __GTK_SELECTION_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_SELECTION_H__
-#define __GTK_SELECTION_H__
-
 #include <gtk/gtkwidget.h>
 #include <gtk/gtktextiter.h>
 
diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h
index dacb6c4..4a9b63a 100644
--- a/gtk/gtkseparator.h
+++ b/gtk/gtkseparator.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_SEPARATOR_H__
 #define __GTK_SEPARATOR_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkwidget.h>
 
 
diff --git a/gtk/gtkseparatormenuitem.h b/gtk/gtkseparatormenuitem.h
index f475a79..f2bb03f 100644
--- a/gtk/gtkseparatormenuitem.h
+++ b/gtk/gtkseparatormenuitem.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_SEPARATOR_MENU_ITEM_H__
 #define __GTK_SEPARATOR_MENU_ITEM_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkmenuitem.h>
 
 
diff --git a/gtk/gtkseparatortoolitem.h b/gtk/gtkseparatortoolitem.h
index 2e57141..1a941f7 100644
--- a/gtk/gtkseparatortoolitem.h
+++ b/gtk/gtkseparatortoolitem.h
@@ -17,13 +17,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_SEPARATOR_TOOL_ITEM_H__
+#define __GTK_SEPARATOR_TOOL_ITEM_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_SEPARATOR_TOOL_ITEM_H__
-#define __GTK_SEPARATOR_TOOL_ITEM_H__
-
 #include <gtk/gtktoolitem.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h
index 4a33093..9e6434a 100644
--- a/gtk/gtksettings.h
+++ b/gtk/gtksettings.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_SETTINGS_H__
+#define __GTK_SETTINGS_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_SETTINGS_H__
-#define __GTK_SETTINGS_H__
-
 #include <gdk/gdk.h>
 #include <gtk/gtktypes.h>
 
diff --git a/gtk/gtkshow.h b/gtk/gtkshow.h
index b52f2c6..339270a 100644
--- a/gtk/gtkshow.h
+++ b/gtk/gtkshow.h
@@ -18,13 +18,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_SHOW_H__
+#define __GTK_SHOW_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_SHOW_H__
-#define __GTK_SHOW_H__
-
 G_BEGIN_DECLS
 
 gboolean gtk_show_uri  (GdkScreen   *screen,
diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h
index 3322c0a..9e14622 100644
--- a/gtk/gtksizegroup.h
+++ b/gtk/gtksizegroup.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_SIZE_GROUP_H__
+#define __GTK_SIZE_GROUP_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_SIZE_GROUP_H__
-#define __GTK_SIZE_GROUP_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index b5ae4e9..65f52e0 100644
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_SOCKET_H__
+#define __GTK_SOCKET_H__
+
 #if !defined (__GTKX_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtkx.h> can be included directly."
 #endif
 
-#ifndef __GTK_SOCKET_H__
-#define __GTK_SOCKET_H__
-
 #include <gtk/gtk.h>
 
 #ifdef GDK_WINDOWING_X11
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index 362c4d5..7ed6352 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -25,14 +25,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_SPIN_BUTTON_H__
 #define __GTK_SPIN_BUTTON_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkentry.h>
 
 
diff --git a/gtk/gtkspinner.h b/gtk/gtkspinner.h
index 1e592b2..ef5ff0d 100644
--- a/gtk/gtkspinner.h
+++ b/gtk/gtkspinner.h
@@ -20,13 +20,13 @@
  * by Christian Hergert <christian.hergert@gmail.com>
  */
 
+#ifndef __GTK_SPINNER_H__
+#define __GTK_SPINNER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_SPINNER_H__
-#define __GTK_SPINNER_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h
index adcbb2d..af018b6 100644
--- a/gtk/gtkstatusbar.h
+++ b/gtk/gtkstatusbar.h
@@ -23,13 +23,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_STATUSBAR_H__
+#define __GTK_STATUSBAR_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_STATUSBAR_H__
-#define __GTK_STATUSBAR_H__
-
 #include <gtk/gtkbox.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h
index e819aa7..36de4e6 100644
--- a/gtk/gtkstatusicon.h
+++ b/gtk/gtkstatusicon.h
@@ -19,13 +19,13 @@
  *      Mark McLoughlin <mark@skynet.ie>
  */
 
+#ifndef __GTK_STATUS_ICON_H__
+#define __GTK_STATUS_ICON_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_STATUS_ICON_H__
-#define __GTK_STATUS_ICON_H__
-
 #include <gtk/gtkimage.h>
 #include <gtk/gtkmenu.h>
 
diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h
index ff40979..0c60f67 100644
--- a/gtk/gtkstock.h
+++ b/gtk/gtkstock.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_STOCK_H__
 #define __GTK_STOCK_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gdk/gdk.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h
index 3d79c65..cfdbda9 100644
--- a/gtk/gtkstylecontext.h
+++ b/gtk/gtkstylecontext.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_STYLE_CONTEXT_H__
+#define __GTK_STYLE_CONTEXT_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_STYLE_CONTEXT_H__
-#define __GTK_STYLE_CONTEXT_H__
-
 #include <gtk/gtkborder.h>
 #include <gtk/gtkcsssection.h>
 #include <gtk/gtkstyleprovider.h>
diff --git a/gtk/gtkstyleproperties.h b/gtk/gtkstyleproperties.h
index 7237361..fd81699 100644
--- a/gtk/gtkstyleproperties.h
+++ b/gtk/gtkstyleproperties.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_STYLE_PROPERTIES_H__
+#define __GTK_STYLE_PROPERTIES_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_STYLE_PROPERTIES_H__
-#define __GTK_STYLE_PROPERTIES_H__
-
 #include <glib-object.h>
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
diff --git a/gtk/gtkstyleprovider.h b/gtk/gtkstyleprovider.h
index 56fa141..81bf5d6 100644
--- a/gtk/gtkstyleprovider.h
+++ b/gtk/gtkstyleprovider.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_STYLE_PROVIDER_H__
+#define __GTK_STYLE_PROVIDER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_STYLE_PROVIDER_H__
-#define __GTK_STYLE_PROVIDER_H__
-
 #include <glib-object.h>
 #include <gtk/gtkenums.h>
 #include <gtk/gtkiconfactory.h>
diff --git a/gtk/gtkswitch.h b/gtk/gtkswitch.h
index d288cc2..1f7ed4c 100644
--- a/gtk/gtkswitch.h
+++ b/gtk/gtkswitch.h
@@ -23,13 +23,13 @@
  * Based on similar code from Mx.
  */
 
+#ifndef __GTK_SWITCH_H__
+#define __GTK_SWITCH_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_SWITCH_H__
-#define __GTK_SWITCH_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtktestutils.h b/gtk/gtktestutils.h
index 207fefd..c27decf 100644
--- a/gtk/gtktestutils.h
+++ b/gtk/gtktestutils.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_TEST_UTILS_H__
+#define __GTK_TEST_UTILS_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TEST_UTILS_H__
-#define __GTK_TEST_UTILS_H__
-
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkspinbutton.h>
 
diff --git a/gtk/gtktextattributes.h b/gtk/gtktextattributes.h
index d07a2ee..521ac00 100644
--- a/gtk/gtktextattributes.h
+++ b/gtk/gtktextattributes.h
@@ -47,14 +47,14 @@
  *
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_TEXT_ATTRIBUTES_H__
 #define __GTK_TEXT_ATTRIBUTES_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
 
diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index 9255155..793b763 100644
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_TEXT_BUFFER_H__
+#define __GTK_TEXT_BUFFER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TEXT_BUFFER_H__
-#define __GTK_TEXT_BUFFER_H__
-
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkclipboard.h>
 #include <gtk/gtktexttagtable.h>
diff --git a/gtk/gtktextbufferrichtext.h b/gtk/gtktextbufferrichtext.h
index 4dec3f3..44034df 100644
--- a/gtk/gtktextbufferrichtext.h
+++ b/gtk/gtktextbufferrichtext.h
@@ -17,13 +17,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_TEXT_BUFFER_RICH_TEXT_H__
+#define __GTK_TEXT_BUFFER_RICH_TEXT_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TEXT_BUFFER_RICH_TEXT_H__
-#define __GTK_TEXT_BUFFER_RICH_TEXT_H__
-
 #include <gtk/gtktextbuffer.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtktextchild.h b/gtk/gtktextchild.h
index 6884432..2aa859a 100644
--- a/gtk/gtktextchild.h
+++ b/gtk/gtktextchild.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_TEXT_CHILD_H__
+#define __GTK_TEXT_CHILD_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TEXT_CHILD_H__
-#define __GTK_TEXT_CHILD_H__
-
 #include <gdk/gdk.h>
 #include <glib-object.h>
 
diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index 723ce52..5fb9912 100644
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_TEXT_ITER_H__
+#define __GTK_TEXT_ITER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TEXT_ITER_H__
-#define __GTK_TEXT_ITER_H__
-
 #include <gtk/gtktextattributes.h>
 #include <gtk/gtktextchild.h>
 #include <gtk/gtktexttag.h>
diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h
index 3e45d3c..a68a3ae 100644
--- a/gtk/gtktextmark.h
+++ b/gtk/gtktextmark.h
@@ -47,13 +47,13 @@
  *
  */
 
+#ifndef __GTK_TEXT_MARK_H__
+#define __GTK_TEXT_MARK_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TEXT_MARK_H__
-#define __GTK_TEXT_MARK_H__
-
 G_BEGIN_DECLS
 
 typedef struct _GtkTextMark      GtkTextMark;
diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index 1286b37..6c79924 100644
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -47,14 +47,14 @@
  *
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_TEXT_TAG_H__
 #define __GTK_TEXT_TAG_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
 
diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h
index 1ea04ee..3a42e67 100644
--- a/gtk/gtktexttagtable.h
+++ b/gtk/gtktexttagtable.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_TEXT_TAG_TABLE_H__
+#define __GTK_TEXT_TAG_TABLE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TEXT_TAG_TABLE_H__
-#define __GTK_TEXT_TAG_TABLE_H__
-
 #include <gtk/gtktexttag.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h
index 03a17ed..2b81b4f 100644
--- a/gtk/gtktextview.h
+++ b/gtk/gtktextview.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_TEXT_VIEW_H__
+#define __GTK_TEXT_VIEW_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TEXT_VIEW_H__
-#define __GTK_TEXT_VIEW_H__
-
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkimcontext.h>
 #include <gtk/gtktextbuffer.h>
diff --git a/gtk/gtkthemingengine.h b/gtk/gtkthemingengine.h
index 13e1927..15bc407 100644
--- a/gtk/gtkthemingengine.h
+++ b/gtk/gtkthemingengine.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_THEMING_ENGINE_H__
+#define __GTK_THEMING_ENGINE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_THEMING_ENGINE_H__
-#define __GTK_THEMING_ENGINE_H__
-
 #include <glib-object.h>
 #include <cairo.h>
 
diff --git a/gtk/gtktoggleaction.h b/gtk/gtktoggleaction.h
index a9af96f..4803594 100644
--- a/gtk/gtktoggleaction.h
+++ b/gtk/gtktoggleaction.h
@@ -26,13 +26,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_TOGGLE_ACTION_H__
+#define __GTK_TOGGLE_ACTION_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TOGGLE_ACTION_H__
-#define __GTK_TOGGLE_ACTION_H__
-
 #include <gtk/gtkaction.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h
index 3d6c516..1183c9b 100644
--- a/gtk/gtktogglebutton.h
+++ b/gtk/gtktogglebutton.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_TOGGLE_BUTTON_H__
 #define __GTK_TOGGLE_BUTTON_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbutton.h>
 
 
diff --git a/gtk/gtktoggletoolbutton.h b/gtk/gtktoggletoolbutton.h
index 0ef029c..13368e9 100644
--- a/gtk/gtktoggletoolbutton.h
+++ b/gtk/gtktoggletoolbutton.h
@@ -18,13 +18,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_TOGGLE_TOOL_BUTTON_H__
+#define __GTK_TOGGLE_TOOL_BUTTON_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TOGGLE_TOOL_BUTTON_H__
-#define __GTK_TOGGLE_TOOL_BUTTON_H__
-
 #include <gtk/gtktoolbutton.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index ce5186a..deb50e4 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -27,14 +27,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_TOOLBAR_H__
 #define __GTK_TOOLBAR_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtktoolitem.h>
 
diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h
index e9d3734..144607f 100644
--- a/gtk/gtktoolbutton.h
+++ b/gtk/gtktoolbutton.h
@@ -18,13 +18,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_TOOL_BUTTON_H__
+#define __GTK_TOOL_BUTTON_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TOOL_BUTTON_H__
-#define __GTK_TOOL_BUTTON_H__
-
 #include <gtk/gtktoolitem.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h
index 3a706b2..1a62391 100644
--- a/gtk/gtktoolitem.h
+++ b/gtk/gtktoolitem.h
@@ -18,13 +18,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_TOOL_ITEM_H__
+#define __GTK_TOOL_ITEM_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TOOL_ITEM_H__
-#define __GTK_TOOL_ITEM_H__
-
 #include <gtk/gtkbin.h>
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtksizegroup.h>
diff --git a/gtk/gtktoolitemgroup.h b/gtk/gtktoolitemgroup.h
index 350728e..c61b282 100644
--- a/gtk/gtktoolitemgroup.h
+++ b/gtk/gtktoolitemgroup.h
@@ -18,13 +18,13 @@
  *      Mathias Hasselmann
  */
 
+#ifndef __GTK_TOOL_ITEM_GROUP_H__
+#define __GTK_TOOL_ITEM_GROUP_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TOOL_ITEM_GROUP_H__
-#define __GTK_TOOL_ITEM_GROUP_H__
-
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtktoolitem.h>
 
diff --git a/gtk/gtktoolpalette.h b/gtk/gtktoolpalette.h
index 88e2b01..8b05547 100644
--- a/gtk/gtktoolpalette.h
+++ b/gtk/gtktoolpalette.h
@@ -18,13 +18,13 @@
  *      Mathias Hasselmann
  */
 
+#ifndef __GTK_TOOL_PALETTE_H__
+#define __GTK_TOOL_PALETTE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TOOL_PALETTE_H__
-#define __GTK_TOOL_PALETTE_H__
-
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkdnd.h>
 #include <gtk/gtktoolitem.h>
diff --git a/gtk/gtktoolshell.h b/gtk/gtktoolshell.h
index effa171..8cca4eb 100644
--- a/gtk/gtktoolshell.h
+++ b/gtk/gtktoolshell.h
@@ -18,14 +18,14 @@
  *   Mathias Hasselmann
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_TOOL_SHELL_H__
 #define __GTK_TOOL_SHELL_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkenums.h>
 #include <pango/pango.h>
 #include <gtk/gtksizegroup.h>
diff --git a/gtk/gtktooltip.h b/gtk/gtktooltip.h
index ab8f3eb..daa4a3e 100644
--- a/gtk/gtktooltip.h
+++ b/gtk/gtktooltip.h
@@ -17,13 +17,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_TOOLTIP_H__
+#define __GTK_TOOLTIP_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TOOLTIP_H__
-#define __GTK_TOOLTIP_H__
-
 #include <gtk/gtkwindow.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtktreednd.h b/gtk/gtktreednd.h
index 98ba618..934d003 100644
--- a/gtk/gtktreednd.h
+++ b/gtk/gtktreednd.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_TREE_DND_H__
+#define __GTK_TREE_DND_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TREE_DND_H__
-#define __GTK_TREE_DND_H__
-
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkdnd.h>
 
diff --git a/gtk/gtktreemenu.h b/gtk/gtktreemenu.h
index 702051f..674ce01 100644
--- a/gtk/gtktreemenu.h
+++ b/gtk/gtktreemenu.h
@@ -19,13 +19,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_TREE_MENU_H__
+#define __GTK_TREE_MENU_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TREE_MENU_H__
-#define __GTK_TREE_MENU_H__
-
 #include <gtk/gtkmenu.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreeview.h>
diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h
index 7d082f1..fed9850 100644
--- a/gtk/gtktreemodel.h
+++ b/gtk/gtktreemodel.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_TREE_MODEL_H__
+#define __GTK_TREE_MODEL_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TREE_MODEL_H__
-#define __GTK_TREE_MODEL_H__
-
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h
index b3e0c00..832de50 100644
--- a/gtk/gtktreemodelfilter.h
+++ b/gtk/gtktreemodelfilter.h
@@ -16,13 +16,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_TREE_MODEL_FILTER_H__
+#define __GTK_TREE_MODEL_FILTER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TREE_MODEL_FILTER_H__
-#define __GTK_TREE_MODEL_FILTER_H__
-
 #include <gtk/gtktreemodel.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index 7ac5e55..9ba6d1f 100644
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_TREE_MODEL_SORT_H__
+#define __GTK_TREE_MODEL_SORT_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TREE_MODEL_SORT_H__
-#define __GTK_TREE_MODEL_SORT_H__
-
 #include <gdk/gdk.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index 0b99f33..4600930 100644
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_TREE_SELECTION_H__
+#define __GTK_TREE_SELECTION_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TREE_SELECTION_H__
-#define __GTK_TREE_SELECTION_H__
-
 #include <gtk/gtktreeview.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h
index 1d46388..1023a17 100644
--- a/gtk/gtktreesortable.h
+++ b/gtk/gtktreesortable.h
@@ -15,14 +15,14 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_TREE_SORTABLE_H__
 #define __GTK_TREE_SORTABLE_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkenums.h>
 #include <gtk/gtktreemodel.h>
 
diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index 9ea6d3a..69a42be 100644
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_TREE_STORE_H__
+#define __GTK_TREE_STORE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TREE_STORE_H__
-#define __GTK_TREE_STORE_H__
-
 #include <gdk/gdk.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index 8bab066..277d19a 100644
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_TREE_VIEW_H__
+#define __GTK_TREE_VIEW_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TREE_VIEW_H__
-#define __GTK_TREE_VIEW_H__
-
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreeviewcolumn.h>
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 6666909..47cea71 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_TREE_VIEW_COLUMN_H__
+#define __GTK_TREE_VIEW_COLUMN_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TREE_VIEW_COLUMN_H__
-#define __GTK_TREE_VIEW_COLUMN_H__
-
 #include <gtk/gtkcellrenderer.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
diff --git a/gtk/gtktypes.h b/gtk/gtktypes.h
index b3eade3..ed93bc5 100644
--- a/gtk/gtktypes.h
+++ b/gtk/gtktypes.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_TYPES_H__
+#define __GTK_TYPES_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TYPES_H__
-#define __GTK_TYPES_H__
-
 G_BEGIN_DECLS
 
 typedef struct _GtkAdjustment          GtkAdjustment;
diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h
index 181cfa5..85f945a 100644
--- a/gtk/gtkuimanager.h
+++ b/gtk/gtkuimanager.h
@@ -26,13 +26,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_UI_MANAGER_H__
+#define __GTK_UI_MANAGER_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_UI_MANAGER_H__
-#define __GTK_UI_MANAGER_H__
-
 #include <gtk/gtkaccelgroup.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkaction.h>
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index 68aaa85..cd09357 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_VIEWPORT_H__
 #define __GTK_VIEWPORT_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbin.h>
 
 
diff --git a/gtk/gtkvolumebutton.h b/gtk/gtkvolumebutton.h
index 6c4cc21..74a1ca6 100644
--- a/gtk/gtkvolumebutton.h
+++ b/gtk/gtkvolumebutton.h
@@ -25,13 +25,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_VOLUME_BUTTON_H__
+#define __GTK_VOLUME_BUTTON_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_VOLUME_BUTTON_H__
-#define __GTK_VOLUME_BUTTON_H__
-
 #include <gtk/gtkscalebutton.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 2cdc7f3..0f1638f 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_WIDGET_H__
+#define __GTK_WIDGET_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_WIDGET_H__
-#define __GTK_WIDGET_H__
-
 #include <gdk/gdk.h>
 #include <gtk/gtkaccelgroup.h>
 #include <gtk/gtkborder.h>
diff --git a/gtk/gtkwidgetpath.h b/gtk/gtkwidgetpath.h
index 4c2c674..73bf7c0 100644
--- a/gtk/gtkwidgetpath.h
+++ b/gtk/gtkwidgetpath.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_WIDGET_PATH_H__
+#define __GTK_WIDGET_PATH_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_WIDGET_PATH_H__
-#define __GTK_WIDGET_PATH_H__
-
 #include <glib-object.h>
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 0f8491e..22197b2 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_WINDOW_H__
 #define __GTK_WINDOW_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkapplication.h>
 #include <gtk/gtkaccelgroup.h>
 #include <gtk/gtkbin.h>
