diff --git a/gio/gaction.h b/gio/gaction.h
index 0a4e8c3..305ff27 100644
--- a/gio/gaction.h
+++ b/gio/gaction.h
@@ -19,13 +19,13 @@
  * Authors: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_ACTION_H__
+#define __G_ACTION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_ACTION_H__
-#define __G_ACTION_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gactiongroup.h b/gio/gactiongroup.h
index b300aef..f93dc4f 100644
--- a/gio/gactiongroup.h
+++ b/gio/gactiongroup.h
@@ -19,13 +19,13 @@
  * Authors: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_ACTION_GROUP_H__
+#define __G_ACTION_GROUP_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_ACTION_GROUP_H__
-#define __G_ACTION_GROUP_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gactiongroupexporter.h b/gio/gactiongroupexporter.h
index eaa18e6..31f21f2 100644
--- a/gio/gactiongroupexporter.h
+++ b/gio/gactiongroupexporter.h
@@ -21,13 +21,13 @@
  */
 
 
+#ifndef __G_ACTION_GROUP_EXPORTER_H__
+#define __G_ACTION_GROUP_EXPORTER_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_ACTION_GROUP_EXPORTER_H__
-#define __G_ACTION_GROUP_EXPORTER_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gactionmap.h b/gio/gactionmap.h
index 6e7a731..93451a8 100644
--- a/gio/gactionmap.h
+++ b/gio/gactionmap.h
@@ -19,13 +19,13 @@
  * Authors: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_ACTION_MAP_H__
+#define __G_ACTION_MAP_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_ACTION_MAP_H__
-#define __G_ACTION_MAP_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gappinfo.h b/gio/gappinfo.h
index a27e58b..7ebf148 100644
--- a/gio/gappinfo.h
+++ b/gio/gappinfo.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_APP_INFO_H__
+#define __G_APP_INFO_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_APP_INFO_H__
-#define __G_APP_INFO_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gapplication.h b/gio/gapplication.h
index f913cc5..f5b6920 100644
--- a/gio/gapplication.h
+++ b/gio/gapplication.h
@@ -19,13 +19,13 @@
  * Authors: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_APPLICATION_H__
+#define __G_APPLICATION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_APPLICATION_H__
-#define __G_APPLICATION_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gapplicationcommandline.h b/gio/gapplicationcommandline.h
index 8b6b094..a585bf5 100644
--- a/gio/gapplicationcommandline.h
+++ b/gio/gapplicationcommandline.h
@@ -20,13 +20,13 @@
  * Authors: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_APPLICATION_COMMAND_LINE_H__
+#define __G_APPLICATION_COMMAND_LINE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_APPLICATION_COMMAND_LINE_H__
-#define __G_APPLICATION_COMMAND_LINE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gasyncinitable.h b/gio/gasyncinitable.h
index 8442821..1b1004d 100644
--- a/gio/gasyncinitable.h
+++ b/gio/gasyncinitable.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_ASYNC_INITABLE_H__
+#define __G_ASYNC_INITABLE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_ASYNC_INITABLE_H__
-#define __G_ASYNC_INITABLE_H__
-
 #include <gio/giotypes.h>
 #include <gio/ginitable.h>
 
diff --git a/gio/gasyncresult.h b/gio/gasyncresult.h
index e898401..cb3f967 100644
--- a/gio/gasyncresult.h
+++ b/gio/gasyncresult.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_ASYNC_RESULT_H__
+#define __G_ASYNC_RESULT_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_ASYNC_RESULT_H__
-#define __G_ASYNC_RESULT_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gbufferedinputstream.h b/gio/gbufferedinputstream.h
index 029426c..f5dfe50 100644
--- a/gio/gbufferedinputstream.h
+++ b/gio/gbufferedinputstream.h
@@ -20,13 +20,13 @@
  * Author: Christian Kellner <gicmo@gnome.org>
  */
 
+#ifndef __G_BUFFERED_INPUT_STREAM_H__
+#define __G_BUFFERED_INPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_BUFFERED_INPUT_STREAM_H__
-#define __G_BUFFERED_INPUT_STREAM_H__
-
 #include <gio/gfilterinputstream.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gbufferedoutputstream.h b/gio/gbufferedoutputstream.h
index 0d84790..d000331 100644
--- a/gio/gbufferedoutputstream.h
+++ b/gio/gbufferedoutputstream.h
@@ -20,13 +20,13 @@
  * Author: Christian Kellner <gicmo@gnome.org>
  */
 
+#ifndef __G_BUFFERED_OUTPUT_STREAM_H__
+#define __G_BUFFERED_OUTPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_BUFFERED_OUTPUT_STREAM_H__
-#define __G_BUFFERED_OUTPUT_STREAM_H__
-
 #include <gio/gfilteroutputstream.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gcancellable.h b/gio/gcancellable.h
index d8fa633..a2b751d 100644
--- a/gio/gcancellable.h
+++ b/gio/gcancellable.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_CANCELLABLE_H__
+#define __G_CANCELLABLE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_CANCELLABLE_H__
-#define __G_CANCELLABLE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gcharsetconverter.h b/gio/gcharsetconverter.h
index 5198d46..4e7254d 100644
--- a/gio/gcharsetconverter.h
+++ b/gio/gcharsetconverter.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_CHARSET_CONVERTER_H__
+#define __G_CHARSET_CONVERTER_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_CHARSET_CONVERTER_H__
-#define __G_CHARSET_CONVERTER_H__
-
 #include <gio/gconverter.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gcontenttype.h b/gio/gcontenttype.h
index d7ba23e..04af837 100644
--- a/gio/gcontenttype.h
+++ b/gio/gcontenttype.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_CONTENT_TYPE_H__
+#define __G_CONTENT_TYPE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_CONTENT_TYPE_H__
-#define __G_CONTENT_TYPE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gconverter.h b/gio/gconverter.h
index 6770aaf..d98b92c 100644
--- a/gio/gconverter.h
+++ b/gio/gconverter.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_CONVERTER_H__
+#define __G_CONVERTER_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_CONVERTER_H__
-#define __G_CONVERTER_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gconverterinputstream.h b/gio/gconverterinputstream.h
index 8e4f1d4..1f534cc 100644
--- a/gio/gconverterinputstream.h
+++ b/gio/gconverterinputstream.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_CONVERTER_INPUT_STREAM_H__
+#define __G_CONVERTER_INPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_CONVERTER_INPUT_STREAM_H__
-#define __G_CONVERTER_INPUT_STREAM_H__
-
 #include <gio/gfilterinputstream.h>
 #include <gio/gconverter.h>
 
diff --git a/gio/gconverteroutputstream.h b/gio/gconverteroutputstream.h
index ceac200..3b64957 100644
--- a/gio/gconverteroutputstream.h
+++ b/gio/gconverteroutputstream.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_CONVERTER_OUTPUT_STREAM_H__
+#define __G_CONVERTER_OUTPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_CONVERTER_OUTPUT_STREAM_H__
-#define __G_CONVERTER_OUTPUT_STREAM_H__
-
 #include <gio/gfilteroutputstream.h>
 #include <gio/gconverter.h>
 
diff --git a/gio/gcredentials.h b/gio/gcredentials.h
index 8e09f77..f8860f7 100644
--- a/gio/gcredentials.h
+++ b/gio/gcredentials.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_CREDENTIALS_H__
+#define __G_CREDENTIALS_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_CREDENTIALS_H__
-#define __G_CREDENTIALS_H__
-
 #include <gio/giotypes.h>
 
 #ifdef G_OS_UNIX
diff --git a/gio/gdatainputstream.h b/gio/gdatainputstream.h
index 0f205c6..9612f18 100644
--- a/gio/gdatainputstream.h
+++ b/gio/gdatainputstream.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_DATA_INPUT_STREAM_H__
+#define __G_DATA_INPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DATA_INPUT_STREAM_H__
-#define __G_DATA_INPUT_STREAM_H__
-
 #include <gio/gbufferedinputstream.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdataoutputstream.h b/gio/gdataoutputstream.h
index 0fb3cbf..fda0767 100644
--- a/gio/gdataoutputstream.h
+++ b/gio/gdataoutputstream.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_DATA_OUTPUT_STREAM_H__
+#define __G_DATA_OUTPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DATA_OUTPUT_STREAM_H__
-#define __G_DATA_OUTPUT_STREAM_H__
-
 #include <gio/gfilteroutputstream.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdbusactiongroup.h b/gio/gdbusactiongroup.h
index 12a2f60..ed215a4 100644
--- a/gio/gdbusactiongroup.h
+++ b/gio/gdbusactiongroup.h
@@ -20,13 +20,13 @@
  * Authors: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_DBUS_ACTION_GROUP_H__
+#define __G_DBUS_ACTION_GROUP_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DBUS_ACTION_GROUP_H__
-#define __G_DBUS_ACTION_GROUP_H__
-
 #include "giotypes.h"
 
 G_BEGIN_DECLS
diff --git a/gio/gdbusaddress.h b/gio/gdbusaddress.h
index 955c39e..abd2c2e 100644
--- a/gio/gdbusaddress.h
+++ b/gio/gdbusaddress.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_ADDRESS_H__
+#define __G_DBUS_ADDRESS_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DBUS_ADDRESS_H__
-#define __G_DBUS_ADDRESS_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdbusauth.h b/gio/gdbusauth.h
index 1ee3ec4..0eee95c 100644
--- a/gio/gdbusauth.h
+++ b/gio/gdbusauth.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_AUTH_H__
+#define __G_DBUS_AUTH_H__
+
 #if !defined (GIO_COMPILATION)
 #error "gdbusauth.h is a private header file."
 #endif
 
-#ifndef __G_DBUS_AUTH_H__
-#define __G_DBUS_AUTH_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdbusauthmechanism.h b/gio/gdbusauthmechanism.h
index 44829c0..2373a88 100644
--- a/gio/gdbusauthmechanism.h
+++ b/gio/gdbusauthmechanism.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_AUTH_MECHANISM_H__
+#define __G_DBUS_AUTH_MECHANISM_H__
+
 #if !defined (GIO_COMPILATION)
 #error "gdbusauthmechanism.h is a private header file."
 #endif
 
-#ifndef __G_DBUS_AUTH_MECHANISM_H__
-#define __G_DBUS_AUTH_MECHANISM_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdbusauthmechanismanon.h b/gio/gdbusauthmechanismanon.h
index 744044e..f5d69a7 100644
--- a/gio/gdbusauthmechanismanon.h
+++ b/gio/gdbusauthmechanismanon.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_AUTH_MECHANISM_ANON_H__
+#define __G_DBUS_AUTH_MECHANISM_ANON_H__
+
 #if !defined (GIO_COMPILATION)
 #error "gdbusauthmechanismanon.h is a private header file."
 #endif
 
-#ifndef __G_DBUS_AUTH_MECHANISM_ANON_H__
-#define __G_DBUS_AUTH_MECHANISM_ANON_H__
-
 #include <gio/giotypes.h>
 #include <gio/gdbusauthmechanism.h>
 
diff --git a/gio/gdbusauthmechanismexternal.h b/gio/gdbusauthmechanismexternal.h
index ca45136..b5f011f 100644
--- a/gio/gdbusauthmechanismexternal.h
+++ b/gio/gdbusauthmechanismexternal.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_AUTH_MECHANISM_EXTERNAL_H__
+#define __G_DBUS_AUTH_MECHANISM_EXTERNAL_H__
+
 #if !defined (GIO_COMPILATION)
 #error "gdbusauthmechanismexternal.h is a private header file."
 #endif
 
-#ifndef __G_DBUS_AUTH_MECHANISM_EXTERNAL_H__
-#define __G_DBUS_AUTH_MECHANISM_EXTERNAL_H__
-
 #include <gio/giotypes.h>
 #include <gio/gdbusauthmechanism.h>
 
diff --git a/gio/gdbusauthmechanismsha1.h b/gio/gdbusauthmechanismsha1.h
index 6a70afa..7cb08f7 100644
--- a/gio/gdbusauthmechanismsha1.h
+++ b/gio/gdbusauthmechanismsha1.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_AUTH_MECHANISM_SHA1_H__
+#define __G_DBUS_AUTH_MECHANISM_SHA1_H__
+
 #if !defined (GIO_COMPILATION)
 #error "gdbusauthmechanismsha1.h is a private header file."
 #endif
 
-#ifndef __G_DBUS_AUTH_MECHANISM_SHA1_H__
-#define __G_DBUS_AUTH_MECHANISM_SHA1_H__
-
 #include <gio/giotypes.h>
 #include <gio/gdbusauthmechanism.h>
 
diff --git a/gio/gdbusauthobserver.h b/gio/gdbusauthobserver.h
index ffb1ddf..184e25a 100644
--- a/gio/gdbusauthobserver.h
+++ b/gio/gdbusauthobserver.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_AUTH_OBSERVER_H__
+#define __G_DBUS_AUTH_OBSERVER_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DBUS_AUTH_OBSERVER_H__
-#define __G_DBUS_AUTH_OBSERVER_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdbusconnection.h b/gio/gdbusconnection.h
index 6c1ec5c..4ffdd93 100644
--- a/gio/gdbusconnection.h
+++ b/gio/gdbusconnection.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_CONNECTION_H__
+#define __G_DBUS_CONNECTION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DBUS_CONNECTION_H__
-#define __G_DBUS_CONNECTION_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdbuserror.h b/gio/gdbuserror.h
index 85e2f88..d32b928 100644
--- a/gio/gdbuserror.h
+++ b/gio/gdbuserror.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_ERROR_H__
+#define __G_DBUS_ERROR_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DBUS_ERROR_H__
-#define __G_DBUS_ERROR_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdbusintrospection.h b/gio/gdbusintrospection.h
index 884c733..239638d 100644
--- a/gio/gdbusintrospection.h
+++ b/gio/gdbusintrospection.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_INTROSPECTION_H__
+#define __G_DBUS_INTROSPECTION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DBUS_INTROSPECTION_H__
-#define __G_DBUS_INTROSPECTION_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdbusmessage.h b/gio/gdbusmessage.h
index 5c4febd..f8328aa 100644
--- a/gio/gdbusmessage.h
+++ b/gio/gdbusmessage.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_MESSAGE_H__
+#define __G_DBUS_MESSAGE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DBUS_MESSAGE_H__
-#define __G_DBUS_MESSAGE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdbusmethodinvocation.h b/gio/gdbusmethodinvocation.h
index b1a87ac..9146b21 100644
--- a/gio/gdbusmethodinvocation.h
+++ b/gio/gdbusmethodinvocation.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_METHOD_INVOCATION_H__
+#define __G_DBUS_METHOD_INVOCATION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DBUS_METHOD_INVOCATION_H__
-#define __G_DBUS_METHOD_INVOCATION_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdbusnameowning.h b/gio/gdbusnameowning.h
index fc4b92c..9cef19d 100644
--- a/gio/gdbusnameowning.h
+++ b/gio/gdbusnameowning.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_NAME_OWNING_H__
+#define __G_DBUS_NAME_OWNING_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DBUS_NAME_OWNING_H__
-#define __G_DBUS_NAME_OWNING_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdbusnamewatching.h b/gio/gdbusnamewatching.h
index a2bb6dc..785072a 100644
--- a/gio/gdbusnamewatching.h
+++ b/gio/gdbusnamewatching.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_NAME_WATCHING_H__
+#define __G_DBUS_NAME_WATCHING_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DBUS_NAME_WATCHING_H__
-#define __G_DBUS_NAME_WATCHING_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdbusprivate.h b/gio/gdbusprivate.h
index 1ac7754..3a62867 100644
--- a/gio/gdbusprivate.h
+++ b/gio/gdbusprivate.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_PRIVATE_H__
+#define __G_DBUS_PRIVATE_H__
+
 #if !defined (GIO_COMPILATION)
 #error "gdbusprivate.h is a private header file."
 #endif
 
-#ifndef __G_DBUS_PRIVATE_H__
-#define __G_DBUS_PRIVATE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdbusproxy.h b/gio/gdbusproxy.h
index 1e920d3..8df564c 100644
--- a/gio/gdbusproxy.h
+++ b/gio/gdbusproxy.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_PROXY_H__
+#define __G_DBUS_PROXY_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DBUS_PROXY_H__
-#define __G_DBUS_PROXY_H__
-
 #include <gio/giotypes.h>
 #include <gio/gdbusintrospection.h>
 
diff --git a/gio/gdbusserver.h b/gio/gdbusserver.h
index 3d10c1b..49f949f 100644
--- a/gio/gdbusserver.h
+++ b/gio/gdbusserver.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_SERVER_H__
+#define __G_DBUS_SERVER_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DBUS_SERVER_H__
-#define __G_DBUS_SERVER_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdbusutils.h b/gio/gdbusutils.h
index a05a230..467d151 100644
--- a/gio/gdbusutils.h
+++ b/gio/gdbusutils.h
@@ -20,13 +20,13 @@
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_UTILS_H__
+#define __G_DBUS_UTILS_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DBUS_UTILS_H__
-#define __G_DBUS_UTILS_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdrive.h b/gio/gdrive.h
index d42b0b7..c4f9070 100644
--- a/gio/gdrive.h
+++ b/gio/gdrive.h
@@ -21,13 +21,13 @@
  *         David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DRIVE_H__
+#define __G_DRIVE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DRIVE_H__
-#define __G_DRIVE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gdummyproxyresolver.h b/gio/gdummyproxyresolver.h
index 75bab7b..d5e091f 100644
--- a/gio/gdummyproxyresolver.h
+++ b/gio/gdummyproxyresolver.h
@@ -20,13 +20,13 @@
  * Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
  */
 
+#ifndef __G_DUMMY_PROXY_RESOLVER_H__
+#define __G_DUMMY_PROXY_RESOLVER_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_DUMMY_PROXY_RESOLVER_H__
-#define __G_DUMMY_PROXY_RESOLVER_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gemblem.h b/gio/gemblem.h
index 06816e1..65587ac 100644
--- a/gio/gemblem.h
+++ b/gio/gemblem.h
@@ -19,13 +19,13 @@
  *
  */
 
+#ifndef __G_EMBLEM_H__
+#define __G_EMBLEM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_EMBLEM_H__
-#define __G_EMBLEM_H__
-
 #include <gio/gioenums.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gemblemedicon.h b/gio/gemblemedicon.h
index ded6928..20c0c66 100644
--- a/gio/gemblemedicon.h
+++ b/gio/gemblemedicon.h
@@ -21,13 +21,13 @@
  *         Clemens N. Buss <cebuzz@gmail.com>
  */
 
+#ifndef __G_EMBLEMED_ICON_H__
+#define __G_EMBLEMED_ICON_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_EMBLEMED_ICON_H__
-#define __G_EMBLEMED_ICON_H__
-
 #include <gio/gicon.h>
 #include <gio/gemblem.h>
 
diff --git a/gio/gfile.h b/gio/gfile.h
index 8e8b9a3..b1291ef 100644
--- a/gio/gfile.h
+++ b/gio/gfile.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_FILE_H__
+#define __G_FILE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_FILE_H__
-#define __G_FILE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gfileattribute.h b/gio/gfileattribute.h
index 445cdd7..5982e1d 100644
--- a/gio/gfileattribute.h
+++ b/gio/gfileattribute.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_FILE_ATTRIBUTE_H__
+#define __G_FILE_ATTRIBUTE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_FILE_ATTRIBUTE_H__
-#define __G_FILE_ATTRIBUTE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gfileenumerator.h b/gio/gfileenumerator.h
index 9cd2f3e..f894f43 100644
--- a/gio/gfileenumerator.h
+++ b/gio/gfileenumerator.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_FILE_ENUMERATOR_H__
+#define __G_FILE_ENUMERATOR_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_FILE_ENUMERATOR_H__
-#define __G_FILE_ENUMERATOR_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gfileicon.h b/gio/gfileicon.h
index 08ae791..5ae1491 100644
--- a/gio/gfileicon.h
+++ b/gio/gfileicon.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_FILE_ICON_H__
+#define __G_FILE_ICON_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_FILE_ICON_H__
-#define __G_FILE_ICON_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gfileinfo.h b/gio/gfileinfo.h
index 98aeaae..b9f3790 100644
--- a/gio/gfileinfo.h
+++ b/gio/gfileinfo.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_FILE_INFO_H__
+#define __G_FILE_INFO_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_FILE_INFO_H__
-#define __G_FILE_INFO_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gfileinputstream.h b/gio/gfileinputstream.h
index 08c056e..380b813 100644
--- a/gio/gfileinputstream.h
+++ b/gio/gfileinputstream.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_FILE_INPUT_STREAM_H__
+#define __G_FILE_INPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_FILE_INPUT_STREAM_H__
-#define __G_FILE_INPUT_STREAM_H__
-
 #include <gio/ginputstream.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gfileiostream.h b/gio/gfileiostream.h
index 31497e3..70fa824 100644
--- a/gio/gfileiostream.h
+++ b/gio/gfileiostream.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_FILE_IO_STREAM_H__
+#define __G_FILE_IO_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_FILE_IO_STREAM_H__
-#define __G_FILE_IO_STREAM_H__
-
 #include <gio/giostream.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gfilemonitor.h b/gio/gfilemonitor.h
index 8e27d22..64a065f 100644
--- a/gio/gfilemonitor.h
+++ b/gio/gfilemonitor.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_FILE_MONITOR_H__
+#define __G_FILE_MONITOR_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_FILE_MONITOR_H__
-#define __G_FILE_MONITOR_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gfilenamecompleter.h b/gio/gfilenamecompleter.h
index 1899c27..0a7b498 100644
--- a/gio/gfilenamecompleter.h
+++ b/gio/gfilenamecompleter.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_FILENAME_COMPLETER_H__
+#define __G_FILENAME_COMPLETER_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_FILENAME_COMPLETER_H__
-#define __G_FILENAME_COMPLETER_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gfileoutputstream.h b/gio/gfileoutputstream.h
index 3b5f85d..723e5df 100644
--- a/gio/gfileoutputstream.h
+++ b/gio/gfileoutputstream.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_FILE_OUTPUT_STREAM_H__
+#define __G_FILE_OUTPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_FILE_OUTPUT_STREAM_H__
-#define __G_FILE_OUTPUT_STREAM_H__
-
 #include <gio/goutputstream.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gfilterinputstream.h b/gio/gfilterinputstream.h
index 1514104..1f1a5ec 100644
--- a/gio/gfilterinputstream.h
+++ b/gio/gfilterinputstream.h
@@ -20,13 +20,13 @@
  * Author: Christian Kellner <gicmo@gnome.org>
  */
 
+#ifndef __G_FILTER_INPUT_STREAM_H__
+#define __G_FILTER_INPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_FILTER_INPUT_STREAM_H__
-#define __G_FILTER_INPUT_STREAM_H__
-
 #include <gio/ginputstream.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gfilteroutputstream.h b/gio/gfilteroutputstream.h
index 10350e5..428d5d3 100644
--- a/gio/gfilteroutputstream.h
+++ b/gio/gfilteroutputstream.h
@@ -20,13 +20,13 @@
  * Author: Christian Kellner <gicmo@gnome.org>
  */
 
+#ifndef __G_FILTER_OUTPUT_STREAM_H__
+#define __G_FILTER_OUTPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_FILTER_OUTPUT_STREAM_H__
-#define __G_FILTER_OUTPUT_STREAM_H__
-
 #include <gio/goutputstream.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gicon.h b/gio/gicon.h
index 8f339f6..d126753 100644
--- a/gio/gicon.h
+++ b/gio/gicon.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_ICON_H__
+#define __G_ICON_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_ICON_H__
-#define __G_ICON_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/ginetaddress.h b/gio/ginetaddress.h
index d523cd6..b91c717 100644
--- a/gio/ginetaddress.h
+++ b/gio/ginetaddress.h
@@ -21,13 +21,13 @@
  *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
  */
 
+#ifndef __G_INET_ADDRESS_H__
+#define __G_INET_ADDRESS_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_INET_ADDRESS_H__
-#define __G_INET_ADDRESS_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/ginetaddressmask.h b/gio/ginetaddressmask.h
index 3c3a86c..05b0630 100644
--- a/gio/ginetaddressmask.h
+++ b/gio/ginetaddressmask.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_INET_ADDRESS_MASK_H__
+#define __G_INET_ADDRESS_MASK_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_INET_ADDRESS_MASK_H__
-#define __G_INET_ADDRESS_MASK_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/ginetsocketaddress.h b/gio/ginetsocketaddress.h
index ab20235..1d83387 100644
--- a/gio/ginetsocketaddress.h
+++ b/gio/ginetsocketaddress.h
@@ -21,13 +21,13 @@
  *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
  */
 
+#ifndef __G_INET_SOCKET_ADDRESS_H__
+#define __G_INET_SOCKET_ADDRESS_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_INET_SOCKET_ADDRESS_H__
-#define __G_INET_SOCKET_ADDRESS_H__
-
 #include <gio/gsocketaddress.h>
 
 G_BEGIN_DECLS
diff --git a/gio/ginitable.h b/gio/ginitable.h
index 1a2d13d..318efbe 100644
--- a/gio/ginitable.h
+++ b/gio/ginitable.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_INITABLE_H__
+#define __G_INITABLE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_INITABLE_H__
-#define __G_INITABLE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/ginputstream.h b/gio/ginputstream.h
index e9b36f7..5f109c8 100644
--- a/gio/ginputstream.h
+++ b/gio/ginputstream.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_INPUT_STREAM_H__
+#define __G_INPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_INPUT_STREAM_H__
-#define __G_INPUT_STREAM_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gioenums.h b/gio/gioenums.h
index 39c43c0..532e8cd 100644
--- a/gio/gioenums.h
+++ b/gio/gioenums.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __GIO_ENUMS_H__
+#define __GIO_ENUMS_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __GIO_ENUMS_H__
-#define __GIO_ENUMS_H__
-
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gioerror.h b/gio/gioerror.h
index 12c2b06..5c153be 100644
--- a/gio/gioerror.h
+++ b/gio/gioerror.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_IO_ERROR_H__
+#define __G_IO_ERROR_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_IO_ERROR_H__
-#define __G_IO_ERROR_H__
-
 #include <glib.h>
 #include <gio/gioenums.h>
 
diff --git a/gio/giomodule.h b/gio/giomodule.h
index 3a8a6f1..f3eaa40 100644
--- a/gio/giomodule.h
+++ b/gio/giomodule.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_IO_MODULE_H__
+#define __G_IO_MODULE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_IO_MODULE_H__
-#define __G_IO_MODULE_H__
-
 #include <gio/giotypes.h>
 #include <gmodule.h>
 
diff --git a/gio/gioscheduler.h b/gio/gioscheduler.h
index 431f06e..c044b82 100644
--- a/gio/gioscheduler.h
+++ b/gio/gioscheduler.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_IO_SCHEDULER_H__
+#define __G_IO_SCHEDULER_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_IO_SCHEDULER_H__
-#define __G_IO_SCHEDULER_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/giostream.h b/gio/giostream.h
index 90283dd..09c365b 100644
--- a/gio/giostream.h
+++ b/gio/giostream.h
@@ -14,13 +14,13 @@
  *          Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_IO_STREAM_H__
+#define __G_IO_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_IO_STREAM_H__
-#define __G_IO_STREAM_H__
-
 #include <gio/ginputstream.h>
 #include <gio/goutputstream.h>
 #include <gio/gcancellable.h>
diff --git a/gio/giotypes.h b/gio/giotypes.h
index 82845c5..2696091 100644
--- a/gio/giotypes.h
+++ b/gio/giotypes.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __GIO_TYPES_H__
+#define __GIO_TYPES_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __GIO_TYPES_H__
-#define __GIO_TYPES_H__
-
 #include <gio/gioenums.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gloadableicon.h b/gio/gloadableicon.h
index 754090f..b23917d 100644
--- a/gio/gloadableicon.h
+++ b/gio/gloadableicon.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_LOADABLE_ICON_H__
+#define __G_LOADABLE_ICON_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_LOADABLE_ICON_H__
-#define __G_LOADABLE_ICON_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gmemoryinputstream.h b/gio/gmemoryinputstream.h
index 1625ae9..944df9b 100644
--- a/gio/gmemoryinputstream.h
+++ b/gio/gmemoryinputstream.h
@@ -20,13 +20,13 @@
  * Author: Christian Kellner <gicmo@gnome.org>
  */
 
+#ifndef __G_MEMORY_INPUT_STREAM_H__
+#define __G_MEMORY_INPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_MEMORY_INPUT_STREAM_H__
-#define __G_MEMORY_INPUT_STREAM_H__
-
 #include <gio/ginputstream.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gmemoryoutputstream.h b/gio/gmemoryoutputstream.h
index 8be37e6..f852461 100644
--- a/gio/gmemoryoutputstream.h
+++ b/gio/gmemoryoutputstream.h
@@ -20,13 +20,13 @@
  * Author: Christian Kellner <gicmo@gnome.org>
  */
 
+#ifndef __G_MEMORY_OUTPUT_STREAM_H__
+#define __G_MEMORY_OUTPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_MEMORY_OUTPUT_STREAM_H__
-#define __G_MEMORY_OUTPUT_STREAM_H__
-
 #include <gio/goutputstream.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gmount.h b/gio/gmount.h
index 3372892..f3b71e7 100644
--- a/gio/gmount.h
+++ b/gio/gmount.h
@@ -21,13 +21,13 @@
  *         David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_MOUNT_H__
+#define __G_MOUNT_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_MOUNT_H__
-#define __G_MOUNT_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gmountoperation.h b/gio/gmountoperation.h
index 0c11265..f57031a 100644
--- a/gio/gmountoperation.h
+++ b/gio/gmountoperation.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_MOUNT_OPERATION_H__
+#define __G_MOUNT_OPERATION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_MOUNT_OPERATION_H__
-#define __G_MOUNT_OPERATION_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gnativevolumemonitor.h b/gio/gnativevolumemonitor.h
index e072576..8059bed 100644
--- a/gio/gnativevolumemonitor.h
+++ b/gio/gnativevolumemonitor.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_NATIVE_VOLUME_MONITOR_H__
+#define __G_NATIVE_VOLUME_MONITOR_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_NATIVE_VOLUME_MONITOR_H__
-#define __G_NATIVE_VOLUME_MONITOR_H__
-
 #include <gio/gvolumemonitor.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gnetworkaddress.h b/gio/gnetworkaddress.h
index af16321..281271d 100644
--- a/gio/gnetworkaddress.h
+++ b/gio/gnetworkaddress.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_NETWORK_ADDRESS_H__
+#define __G_NETWORK_ADDRESS_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_NETWORK_ADDRESS_H__
-#define __G_NETWORK_ADDRESS_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gnetworkmonitor.h b/gio/gnetworkmonitor.h
index 995ff54..6a53a08 100644
--- a/gio/gnetworkmonitor.h
+++ b/gio/gnetworkmonitor.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_NETWORK_MONITOR_H__
+#define __G_NETWORK_MONITOR_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_NETWORK_MONITOR_H__
-#define __G_NETWORK_MONITOR_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gnetworkservice.h b/gio/gnetworkservice.h
index 1f6dbea..0abac16 100644
--- a/gio/gnetworkservice.h
+++ b/gio/gnetworkservice.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_NETWORK_SERVICE_H__
+#define __G_NETWORK_SERVICE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_NETWORK_SERVICE_H__
-#define __G_NETWORK_SERVICE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/goutputstream.h b/gio/goutputstream.h
index 5e9850c..9502d4a 100644
--- a/gio/goutputstream.h
+++ b/gio/goutputstream.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_OUTPUT_STREAM_H__
+#define __G_OUTPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_OUTPUT_STREAM_H__
-#define __G_OUTPUT_STREAM_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gpermission.h b/gio/gpermission.h
index 3f74257..a4ea113 100644
--- a/gio/gpermission.h
+++ b/gio/gpermission.h
@@ -19,13 +19,13 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_PERMISSION_H__
+#define __G_PERMISSION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_PERMISSION_H__
-#define __G_PERMISSION_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gpollableinputstream.h b/gio/gpollableinputstream.h
index 49af7ee..5903fe9 100644
--- a/gio/gpollableinputstream.h
+++ b/gio/gpollableinputstream.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_POLLABLE_INPUT_STREAM_H__
+#define __G_POLLABLE_INPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_POLLABLE_INPUT_STREAM_H__
-#define __G_POLLABLE_INPUT_STREAM_H__
-
 #include <gio/gio.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gpollableoutputstream.h b/gio/gpollableoutputstream.h
index c5945ce..572948d 100644
--- a/gio/gpollableoutputstream.h
+++ b/gio/gpollableoutputstream.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_POLLABLE_OUTPUT_STREAM_H__
+#define __G_POLLABLE_OUTPUT_STREAM_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_POLLABLE_OUTPUT_STREAM_H__
-#define __G_POLLABLE_OUTPUT_STREAM_H__
-
 #include <gio/gio.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gpollableutils.h b/gio/gpollableutils.h
index 782f3ca..faf16c0 100644
--- a/gio/gpollableutils.h
+++ b/gio/gpollableutils.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_POLLABLE_UTILS_H__
+#define __G_POLLABLE_UTILS_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_POLLABLE_UTILS_H__
-#define __G_POLLABLE_UTILS_H__
-
 #include <gio/gio.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gproxy.h b/gio/gproxy.h
index d7d11a7..4d2c483 100644
--- a/gio/gproxy.h
+++ b/gio/gproxy.h
@@ -22,13 +22,13 @@
  * Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
  */
 
+#ifndef __G_PROXY_H__
+#define __G_PROXY_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_PROXY_H__
-#define __G_PROXY_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gproxyaddress.h b/gio/gproxyaddress.h
index 8d51f11..c44fd9a 100644
--- a/gio/gproxyaddress.h
+++ b/gio/gproxyaddress.h
@@ -20,13 +20,13 @@
  * Authors: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
  */
 
+#ifndef __G_PROXY_ADDRESS_H__
+#define __G_PROXY_ADDRESS_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_PROXY_ADDRESS_H__
-#define __G_PROXY_ADDRESS_H__
-
 #include <gio/ginetsocketaddress.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gproxyaddressenumerator.h b/gio/gproxyaddressenumerator.h
index b38045f..6ce8916 100644
--- a/gio/gproxyaddressenumerator.h
+++ b/gio/gproxyaddressenumerator.h
@@ -20,13 +20,13 @@
  * Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
  */
 
+#ifndef __G_PROXY_ADDRESS_ENUMERATOR_H__
+#define __G_PROXY_ADDRESS_ENUMERATOR_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_PROXY_ADDRESS_ENUMERATOR_H__
-#define __G_PROXY_ADDRESS_ENUMERATOR_H__
-
 #include <gio/gsocketaddressenumerator.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gproxyresolver.h b/gio/gproxyresolver.h
index 7d8d27d..5884dc8 100644
--- a/gio/gproxyresolver.h
+++ b/gio/gproxyresolver.h
@@ -20,13 +20,13 @@
  * Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
  */
 
+#ifndef __G_PROXY_RESOLVER_H__
+#define __G_PROXY_RESOLVER_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_PROXY_RESOLVER_H__
-#define __G_PROXY_RESOLVER_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gremoteactiongroup.h b/gio/gremoteactiongroup.h
index d2849e6..a9926ee 100644
--- a/gio/gremoteactiongroup.h
+++ b/gio/gremoteactiongroup.h
@@ -19,13 +19,13 @@
  * Authors: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_REMOTE_ACTION_GROUP_H__
+#define __G_REMOTE_ACTION_GROUP_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_REMOTE_ACTION_GROUP_H__
-#define __G_REMOTE_ACTION_GROUP_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gresolver.h b/gio/gresolver.h
index ecd8e51..01243f1 100644
--- a/gio/gresolver.h
+++ b/gio/gresolver.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_RESOLVER_H__
+#define __G_RESOLVER_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_RESOLVER_H__
-#define __G_RESOLVER_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gresource.h b/gio/gresource.h
index 79aad7a..2db343c 100644
--- a/gio/gresource.h
+++ b/gio/gresource.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_RESOURCE_H__
+#define __G_RESOURCE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_RESOURCE_H__
-#define __G_RESOURCE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gseekable.h b/gio/gseekable.h
index ba51eea..95df99d 100644
--- a/gio/gseekable.h
+++ b/gio/gseekable.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_SEEKABLE_H__
+#define __G_SEEKABLE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SEEKABLE_H__
-#define __G_SEEKABLE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gsettings.h b/gio/gsettings.h
index 01f3e9e..918c932 100644
--- a/gio/gsettings.h
+++ b/gio/gsettings.h
@@ -19,13 +19,13 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_SETTINGS_H__
+#define __G_SETTINGS_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SETTINGS_H__
-#define __G_SETTINGS_H__
-
 #include <gio/gsettingsschema.h>
 #include <gio/giotypes.h>
 
diff --git a/gio/gsimpleaction.h b/gio/gsimpleaction.h
index 005d0e4..d954d66 100644
--- a/gio/gsimpleaction.h
+++ b/gio/gsimpleaction.h
@@ -19,13 +19,13 @@
  * Authors: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_SIMPLE_ACTION_H__
+#define __G_SIMPLE_ACTION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SIMPLE_ACTION_H__
-#define __G_SIMPLE_ACTION_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gsimpleactiongroup.h b/gio/gsimpleactiongroup.h
index 5cba046..243cd4f 100644
--- a/gio/gsimpleactiongroup.h
+++ b/gio/gsimpleactiongroup.h
@@ -19,13 +19,13 @@
  * Authors: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_SIMPLE_ACTION_GROUP_H__
+#define __G_SIMPLE_ACTION_GROUP_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SIMPLE_ACTION_GROUP_H__
-#define __G_SIMPLE_ACTION_GROUP_H__
-
 #include "gactiongroup.h"
 #include "gactionmap.h"
 
diff --git a/gio/gsimpleasyncresult.h b/gio/gsimpleasyncresult.h
index 7497630..6233369 100644
--- a/gio/gsimpleasyncresult.h
+++ b/gio/gsimpleasyncresult.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_SIMPLE_ASYNC_RESULT_H__
+#define __G_SIMPLE_ASYNC_RESULT_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SIMPLE_ASYNC_RESULT_H__
-#define __G_SIMPLE_ASYNC_RESULT_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gsimplepermission.h b/gio/gsimplepermission.h
index 367fe89..b9a362b 100644
--- a/gio/gsimplepermission.h
+++ b/gio/gsimplepermission.h
@@ -19,13 +19,13 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_SIMPLE_PERMISSION_H__
+#define __G_SIMPLE_PERMISSION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SIMPLE_PERMISSION_H__
-#define __G_SIMPLE_PERMISSION_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gsocket.h b/gio/gsocket.h
index 29ba44f..d8d905e 100644
--- a/gio/gsocket.h
+++ b/gio/gsocket.h
@@ -22,13 +22,13 @@
  *          Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_SOCKET_H__
+#define __G_SOCKET_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SOCKET_H__
-#define __G_SOCKET_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gsocketaddress.h b/gio/gsocketaddress.h
index 356e2b0..f6119a1 100644
--- a/gio/gsocketaddress.h
+++ b/gio/gsocketaddress.h
@@ -21,13 +21,13 @@
  *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
  */
 
+#ifndef __G_SOCKET_ADDRESS_H__
+#define __G_SOCKET_ADDRESS_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SOCKET_ADDRESS_H__
-#define __G_SOCKET_ADDRESS_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gsocketaddressenumerator.h b/gio/gsocketaddressenumerator.h
index c69be2f..6c636f3 100644
--- a/gio/gsocketaddressenumerator.h
+++ b/gio/gsocketaddressenumerator.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_SOCKET_ADDRESS_ENUMERATOR_H__
+#define __G_SOCKET_ADDRESS_ENUMERATOR_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SOCKET_ADDRESS_ENUMERATOR_H__
-#define __G_SOCKET_ADDRESS_ENUMERATOR_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gsocketclient.h b/gio/gsocketclient.h
index 216310b..e435dde 100644
--- a/gio/gsocketclient.h
+++ b/gio/gsocketclient.h
@@ -22,13 +22,13 @@
  *          Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_SOCKET_CLIENT_H__
+#define __G_SOCKET_CLIENT_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SOCKET_CLIENT_H__
-#define __G_SOCKET_CLIENT_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gsocketconnectable.h b/gio/gsocketconnectable.h
index 0f84a4a..f224706 100644
--- a/gio/gsocketconnectable.h
+++ b/gio/gsocketconnectable.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_SOCKET_CONNECTABLE_H__
+#define __G_SOCKET_CONNECTABLE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SOCKET_CONNECTABLE_H__
-#define __G_SOCKET_CONNECTABLE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gsocketconnection.h b/gio/gsocketconnection.h
index 0daa5f3..ac3f982 100644
--- a/gio/gsocketconnection.h
+++ b/gio/gsocketconnection.h
@@ -23,13 +23,13 @@
  *          Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_SOCKET_CONNECTION_H__
+#define __G_SOCKET_CONNECTION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SOCKET_CONNECTION_H__
-#define __G_SOCKET_CONNECTION_H__
-
 #include <glib-object.h>
 #include <gio/gsocket.h>
 #include <gio/giostream.h>
diff --git a/gio/gsocketcontrolmessage.h b/gio/gsocketcontrolmessage.h
index 6af300c..9b79b82 100644
--- a/gio/gsocketcontrolmessage.h
+++ b/gio/gsocketcontrolmessage.h
@@ -20,13 +20,13 @@
  * Authors: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_SOCKET_CONTROL_MESSAGE_H__
+#define __G_SOCKET_CONTROL_MESSAGE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SOCKET_CONTROL_MESSAGE_H__
-#define __G_SOCKET_CONTROL_MESSAGE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gsocketlistener.h b/gio/gsocketlistener.h
index da09a78..d2b4298 100644
--- a/gio/gsocketlistener.h
+++ b/gio/gsocketlistener.h
@@ -25,13 +25,13 @@
  *          Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_SOCKET_LISTENER_H__
+#define __G_SOCKET_LISTENER_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SOCKET_LISTENER_H__
-#define __G_SOCKET_LISTENER_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gsocketservice.h b/gio/gsocketservice.h
index 27cc0a2..67f3b0b 100644
--- a/gio/gsocketservice.h
+++ b/gio/gsocketservice.h
@@ -22,13 +22,13 @@
  *          Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_SOCKET_SERVICE_H__
+#define __G_SOCKET_SERVICE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SOCKET_SERVICE_H__
-#define __G_SOCKET_SERVICE_H__
-
 #include <gio/gsocketlistener.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gsrvtarget.h b/gio/gsrvtarget.h
index 67ce2a9..ffd59f4 100644
--- a/gio/gsrvtarget.h
+++ b/gio/gsrvtarget.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_SRV_TARGET_H__
+#define __G_SRV_TARGET_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SRV_TARGET_H__
-#define __G_SRV_TARGET_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gtask.h b/gio/gtask.h
index 2cc5f65..bb03226 100644
--- a/gio/gtask.h
+++ b/gio/gtask.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_TASK_H__
+#define __G_TASK_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_TASK_H__
-#define __G_TASK_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gtcpconnection.h b/gio/gtcpconnection.h
index 3928825..adb02a0 100644
--- a/gio/gtcpconnection.h
+++ b/gio/gtcpconnection.h
@@ -20,13 +20,13 @@
  * Authors: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_TCP_CONNECTION_H__
+#define __G_TCP_CONNECTION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_TCP_CONNECTION_H__
-#define __G_TCP_CONNECTION_H__
-
 #include <gio/gsocketconnection.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gtcpwrapperconnection.h b/gio/gtcpwrapperconnection.h
index 01d3a03..26daf2a 100644
--- a/gio/gtcpwrapperconnection.h
+++ b/gio/gtcpwrapperconnection.h
@@ -20,13 +20,13 @@
  *
  */
 
+#ifndef __G_TCP_WRAPPER_CONNECTION_H__
+#define __G_TCP_WRAPPER_CONNECTION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_TCP_WRAPPER_CONNECTION_H__
-#define __G_TCP_WRAPPER_CONNECTION_H__
-
 #include <gio/gtcpconnection.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gtestdbus.h b/gio/gtestdbus.h
index 0fd281b..00644d6 100644
--- a/gio/gtestdbus.h
+++ b/gio/gtestdbus.h
@@ -22,13 +22,13 @@
  *          Xavier Claessens <xavier.claessens@collabora.co.uk>
  */
 
+#ifndef __G_TEST_DBUS_H__
+#define __G_TEST_DBUS_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_TEST_DBUS_H__
-#define __G_TEST_DBUS_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gthemedicon.h b/gio/gthemedicon.h
index b0085e6..98445f6 100644
--- a/gio/gthemedicon.h
+++ b/gio/gthemedicon.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_THEMED_ICON_H__
+#define __G_THEMED_ICON_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_THEMED_ICON_H__
-#define __G_THEMED_ICON_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gthreadedsocketservice.h b/gio/gthreadedsocketservice.h
index f947090..3f43dd9 100644
--- a/gio/gthreadedsocketservice.h
+++ b/gio/gthreadedsocketservice.h
@@ -22,13 +22,13 @@
  *          Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_THREADED_SOCKET_SERVICE_H__
+#define __G_THREADED_SOCKET_SERVICE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_THREADED_SOCKET_SERVICE_H__
-#define __G_THREADED_SOCKET_SERVICE_H__
-
 #include <gio/gsocketservice.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gtlsbackend.h b/gio/gtlsbackend.h
index 389b5d7..b60d8ab 100644
--- a/gio/gtlsbackend.h
+++ b/gio/gtlsbackend.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_TLS_BACKEND_H__
+#define __G_TLS_BACKEND_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_TLS_BACKEND_H__
-#define __G_TLS_BACKEND_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gtlscertificate.h b/gio/gtlscertificate.h
index 991eb1d..97d98ac 100644
--- a/gio/gtlscertificate.h
+++ b/gio/gtlscertificate.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_TLS_CERTIFICATE_H__
+#define __G_TLS_CERTIFICATE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_TLS_CERTIFICATE_H__
-#define __G_TLS_CERTIFICATE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gtlsclientconnection.h b/gio/gtlsclientconnection.h
index eaf62f0..599032a 100644
--- a/gio/gtlsclientconnection.h
+++ b/gio/gtlsclientconnection.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_TLS_CLIENT_CONNECTION_H__
+#define __G_TLS_CLIENT_CONNECTION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_TLS_CLIENT_CONNECTION_H__
-#define __G_TLS_CLIENT_CONNECTION_H__
-
 #include <gio/gtlsconnection.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gtlsconnection.h b/gio/gtlsconnection.h
index 37132cc..68570c0 100644
--- a/gio/gtlsconnection.h
+++ b/gio/gtlsconnection.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_TLS_CONNECTION_H__
+#define __G_TLS_CONNECTION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_TLS_CONNECTION_H__
-#define __G_TLS_CONNECTION_H__
-
 #include <gio/giostream.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gtlsdatabase.h b/gio/gtlsdatabase.h
index 9f93cc9..96b7b31 100644
--- a/gio/gtlsdatabase.h
+++ b/gio/gtlsdatabase.h
@@ -20,13 +20,13 @@
  * Author: Stef Walter <stefw@collabora.co.uk>
  */
 
+#ifndef __G_TLS_DATABASE_H__
+#define __G_TLS_DATABASE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_TLS_DATABASE_H__
-#define __G_TLS_DATABASE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gtlsfiledatabase.h b/gio/gtlsfiledatabase.h
index bc6a17f..5a7c20e 100644
--- a/gio/gtlsfiledatabase.h
+++ b/gio/gtlsfiledatabase.h
@@ -12,13 +12,13 @@
  * Author: Stef Walter <stefw@collabora.co.uk>
  */
 
+#ifndef __G_TLS_FILE_DATABASE_H__
+#define __G_TLS_FILE_DATABASE_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_TLS_FILE_DATABASE_H__
-#define __G_TLS_FILE_DATABASE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gtlsinteraction.h b/gio/gtlsinteraction.h
index fc76fe2..7558842 100644
--- a/gio/gtlsinteraction.h
+++ b/gio/gtlsinteraction.h
@@ -20,13 +20,13 @@
  * Author: Stef Walter <stefw@collabora.co.uk>
  */
 
+#ifndef __G_TLS_INTERACTION_H__
+#define __G_TLS_INTERACTION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_TLS_INTERACTION_H__
-#define __G_TLS_INTERACTION_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gtlspassword.h b/gio/gtlspassword.h
index ef581b6..6bce9fe 100644
--- a/gio/gtlspassword.h
+++ b/gio/gtlspassword.h
@@ -20,13 +20,13 @@
  * Author: Stef Walter <stefw@collabora.co.uk>
  */
 
+#ifndef __G_TLS_PASSWORD_H__
+#define __G_TLS_PASSWORD_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_TLS_PASSWORD_H__
-#define __G_TLS_PASSWORD_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gtlsserverconnection.h b/gio/gtlsserverconnection.h
index c909d55..8d75ac6 100644
--- a/gio/gtlsserverconnection.h
+++ b/gio/gtlsserverconnection.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_TLS_SERVER_CONNECTION_H__
+#define __G_TLS_SERVER_CONNECTION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_TLS_SERVER_CONNECTION_H__
-#define __G_TLS_SERVER_CONNECTION_H__
-
 #include <gio/gtlsconnection.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gvfs.h b/gio/gvfs.h
index bacbe8b..c8bb46c 100644
--- a/gio/gvfs.h
+++ b/gio/gvfs.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_VFS_H__
+#define __G_VFS_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_VFS_H__
-#define __G_VFS_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gvolume.h b/gio/gvolume.h
index b0d862e..8f9b98c 100644
--- a/gio/gvolume.h
+++ b/gio/gvolume.h
@@ -21,13 +21,13 @@
  *         David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_VOLUME_H__
+#define __G_VOLUME_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_VOLUME_H__
-#define __G_VOLUME_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gvolumemonitor.h b/gio/gvolumemonitor.h
index 2bff07e..33a88eb 100644
--- a/gio/gvolumemonitor.h
+++ b/gio/gvolumemonitor.h
@@ -23,13 +23,13 @@
  *         David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_VOLUME_MONITOR_H__
+#define __G_VOLUME_MONITOR_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_VOLUME_MONITOR_H__
-#define __G_VOLUME_MONITOR_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
diff --git a/gio/gzlibcompressor.h b/gio/gzlibcompressor.h
index 5824781..2aac66d 100644
--- a/gio/gzlibcompressor.h
+++ b/gio/gzlibcompressor.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_ZLIB_COMPRESSOR_H__
+#define __G_ZLIB_COMPRESSOR_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_ZLIB_COMPRESSOR_H__
-#define __G_ZLIB_COMPRESSOR_H__
-
 #include <gio/gconverter.h>
 #include <gio/gfileinfo.h>
 
diff --git a/gio/gzlibdecompressor.h b/gio/gzlibdecompressor.h
index f7bb57d..3cace75 100644
--- a/gio/gzlibdecompressor.h
+++ b/gio/gzlibdecompressor.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_ZLIB_DECOMPRESSOR_H__
+#define __G_ZLIB_DECOMPRESSOR_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_ZLIB_DECOMPRESSOR_H__
-#define __G_ZLIB_DECOMPRESSOR_H__
-
 #include <gio/gconverter.h>
 #include <gio/gfileinfo.h>
 
diff --git a/glib/deprecated/gallocator.h b/glib/deprecated/gallocator.h
index e4990e9..a3dc2a1 100644
--- a/glib/deprecated/gallocator.h
+++ b/glib/deprecated/gallocator.h
@@ -15,13 +15,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_ALLOCATOR_H__
+#define __G_ALLOCATOR_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_ALLOCATOR_H__
-#define __G_ALLOCATOR_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/deprecated/gcache.h b/glib/deprecated/gcache.h
index 2e5119b..a7854e0 100644
--- a/glib/deprecated/gcache.h
+++ b/glib/deprecated/gcache.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_CACHE_H__
+#define __G_CACHE_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_CACHE_H__
-#define __G_CACHE_H__
-
 #include <glib/glist.h>
 
 G_BEGIN_DECLS
diff --git a/glib/deprecated/gcompletion.h b/glib/deprecated/gcompletion.h
index 88a0479..fa77596 100644
--- a/glib/deprecated/gcompletion.h
+++ b/glib/deprecated/gcompletion.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_COMPLETION_H__
+#define __G_COMPLETION_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_COMPLETION_H__
-#define __G_COMPLETION_H__
-
 #include <glib/glist.h>
 
 G_BEGIN_DECLS
diff --git a/glib/deprecated/gmain.h b/glib/deprecated/gmain.h
index d1ddf19..bb62240 100644
--- a/glib/deprecated/gmain.h
+++ b/glib/deprecated/gmain.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_DEPRECATED_MAIN_H__
+#define __G_DEPRECATED_MAIN_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_DEPRECATED_MAIN_H__
-#define __G_DEPRECATED_MAIN_H__
-
 #include <glib/gmain.h>
 
 G_BEGIN_DECLS
diff --git a/glib/deprecated/grel.h b/glib/deprecated/grel.h
index c9e0996..b76e006 100644
--- a/glib/deprecated/grel.h
+++ b/glib/deprecated/grel.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_REL_H__
+#define __G_REL_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_REL_H__
-#define __G_REL_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/deprecated/gthread.h b/glib/deprecated/gthread.h
index b882804..b7e6d93 100644
--- a/glib/deprecated/gthread.h
+++ b/glib/deprecated/gthread.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_DEPRECATED_THREAD_H__
+#define __G_DEPRECATED_THREAD_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_DEPRECATED_THREAD_H__
-#define __G_DEPRECATED_THREAD_H__
-
 #include <glib/gthread.h>
 
 G_BEGIN_DECLS
diff --git a/glib/galloca.h b/glib/galloca.h
index 1ecdf65..63c080f 100644
--- a/glib/galloca.h
+++ b/glib/galloca.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_ALLOCA_H__
+#define __G_ALLOCA_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_ALLOCA_H__
-#define __G_ALLOCA_H__
-
 #include <glib/gtypes.h>
 
 #ifdef  __GNUC__
diff --git a/glib/garray.h b/glib/garray.h
index eb37b92..be71c63 100644
--- a/glib/garray.h
+++ b/glib/garray.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_ARRAY_H__
+#define __G_ARRAY_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_ARRAY_H__
-#define __G_ARRAY_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gasyncqueue.h b/glib/gasyncqueue.h
index f0d6d95..96ae84b 100644
--- a/glib/gasyncqueue.h
+++ b/glib/gasyncqueue.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_ASYNCQUEUE_H__
+#define __G_ASYNCQUEUE_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_ASYNCQUEUE_H__
-#define __G_ASYNCQUEUE_H__
-
 #include <glib/gthread.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gatomic.h b/glib/gatomic.h
index 8b52e0b..8c7d867 100644
--- a/glib/gatomic.h
+++ b/glib/gatomic.h
@@ -19,13 +19,13 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_ATOMIC_H__
+#define __G_ATOMIC_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_ATOMIC_H__
-#define __G_ATOMIC_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gbacktrace.h b/glib/gbacktrace.h
index f0a6eab..5ce5fd4 100644
--- a/glib/gbacktrace.h
+++ b/glib/gbacktrace.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_BACKTRACE_H__
+#define __G_BACKTRACE_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_BACKTRACE_H__
-#define __G_BACKTRACE_H__
-
 #include <glib/gtypes.h>
 #include <signal.h>
 
diff --git a/glib/gbase64.h b/glib/gbase64.h
index 88ce6d8..b7be775 100644
--- a/glib/gbase64.h
+++ b/glib/gbase64.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_BASE64_H__
+#define __G_BASE64_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_BASE64_H__
-#define __G_BASE64_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gbookmarkfile.h b/glib/gbookmarkfile.h
index 6b2ee6f..bd7f54e 100644
--- a/glib/gbookmarkfile.h
+++ b/glib/gbookmarkfile.h
@@ -17,13 +17,13 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  */
 
+#ifndef __G_BOOKMARK_FILE_H__
+#define __G_BOOKMARK_FILE_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_BOOKMARK_FILE_H__
-#define __G_BOOKMARK_FILE_H__
-
 #include <glib/gerror.h>
 #include <time.h>
 
diff --git a/glib/gbytes.h b/glib/gbytes.h
index de3c8f8..a3eda97 100644
--- a/glib/gbytes.h
+++ b/glib/gbytes.h
@@ -21,13 +21,13 @@
  *         Stef Walter <stefw@collabora.co.uk>
  */
 
+#ifndef __G_BYTES_H__
+#define __G_BYTES_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_BYTES_H__
-#define __G_BYTES_H__
-
 #include <glib/gtypes.h>
 #include <glib/garray.h>
 
diff --git a/glib/gcharset.h b/glib/gcharset.h
index 9b56524..cbb1975 100644
--- a/glib/gcharset.h
+++ b/glib/gcharset.h
@@ -18,13 +18,13 @@
  *   Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_CHARSET_H__
+#define __G_CHARSET_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_CHARSET_H__
-#define __G_CHARSET_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gchecksum.h b/glib/gchecksum.h
index be6ab65..f7a74d1 100644
--- a/glib/gchecksum.h
+++ b/glib/gchecksum.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_CHECKSUM_H__
+#define __G_CHECKSUM_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_CHECKSUM_H__
-#define __G_CHECKSUM_H__
-
 #include <glib/gtypes.h>
 #include <glib/gbytes.h>
 
diff --git a/glib/gconvert.h b/glib/gconvert.h
index e85556e..59280a3 100644
--- a/glib/gconvert.h
+++ b/glib/gconvert.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_CONVERT_H__
+#define __G_CONVERT_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_CONVERT_H__
-#define __G_CONVERT_H__
-
 #include <glib/gerror.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gdataset.h b/glib/gdataset.h
index a93f6ae..8f5f98c 100644
--- a/glib/gdataset.h
+++ b/glib/gdataset.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_DATASET_H__
+#define __G_DATASET_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_DATASET_H__
-#define __G_DATASET_H__
-
 #include <glib/gquark.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gdate.h b/glib/gdate.h
index 5ef1850..205ca08 100644
--- a/glib/gdate.h
+++ b/glib/gdate.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_DATE_H__
+#define __G_DATE_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_DATE_H__
-#define __G_DATE_H__
-
 #include <time.h>
 
 #include <glib/gtypes.h>
diff --git a/glib/gdatetime.h b/glib/gdatetime.h
index 6643e3f..396c07d 100644
--- a/glib/gdatetime.h
+++ b/glib/gdatetime.h
@@ -23,13 +23,13 @@
  *          Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_DATE_TIME_H__
+#define __G_DATE_TIME_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_DATE_TIME_H__
-#define __G_DATE_TIME_H__
-
 #include <glib/gtimezone.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gdir.h b/glib/gdir.h
index 2e734ac..6727e94 100644
--- a/glib/gdir.h
+++ b/glib/gdir.h
@@ -21,13 +21,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_DIR_H__
+#define __G_DIR_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_DIR_H__
-#define __G_DIR_H__
-
 #include <glib/gerror.h>
 
 G_BEGIN_DECLS
diff --git a/glib/genviron.h b/glib/genviron.h
index 2f23b58..eb16c48 100644
--- a/glib/genviron.h
+++ b/glib/genviron.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_ENVIRON_H__
+#define __G_ENVIRON_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_ENVIRON_H__
-#define __G_ENVIRON_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gerror.h b/glib/gerror.h
index 6eb65fe..f9020d6 100644
--- a/glib/gerror.h
+++ b/glib/gerror.h
@@ -18,13 +18,13 @@
  *   Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_ERROR_H__
+#define __G_ERROR_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_ERROR_H__
-#define __G_ERROR_H__
-
 #include <stdarg.h>
 
 #include <glib/gquark.h>
diff --git a/glib/gfileutils.h b/glib/gfileutils.h
index 17b2acb..90cab2e 100644
--- a/glib/gfileutils.h
+++ b/glib/gfileutils.h
@@ -18,13 +18,13 @@
  *   Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_FILEUTILS_H__
+#define __G_FILEUTILS_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_FILEUTILS_H__
-#define __G_FILEUTILS_H__
-
 #include <glib/gerror.h>
 
 G_BEGIN_DECLS
diff --git a/glib/ggettext.h b/glib/ggettext.h
index 54bbaa8..b1b73a6 100644
--- a/glib/ggettext.h
+++ b/glib/ggettext.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_GETTEXT_H__
+#define __G_GETTEXT_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_GETTEXT_H__
-#define __G_GETTEXT_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/ghash.h b/glib/ghash.h
index 3eb8912..9cf01ad 100644
--- a/glib/ghash.h
+++ b/glib/ghash.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_HASH_H__
+#define __G_HASH_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_HASH_H__
-#define __G_HASH_H__
-
 #include <glib/gtypes.h>
 #include <glib/glist.h>
 
diff --git a/glib/ghmac.h b/glib/ghmac.h
index d03d71f..94bc427 100644
--- a/glib/ghmac.h
+++ b/glib/ghmac.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_HMAC_H__
+#define __G_HMAC_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_HMAC_H__
-#define __G_HMAC_H__
-
 #include <glib/gtypes.h>
 #include "gchecksum.h"
 
diff --git a/glib/ghook.h b/glib/ghook.h
index e7292ea..73e2efb 100644
--- a/glib/ghook.h
+++ b/glib/ghook.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_HOOK_H__
+#define __G_HOOK_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_HOOK_H__
-#define __G_HOOK_H__
-
 #include <glib/gmem.h>
 
 G_BEGIN_DECLS
diff --git a/glib/ghostutils.h b/glib/ghostutils.h
index 0349da3..e2733f5 100644
--- a/glib/ghostutils.h
+++ b/glib/ghostutils.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_HOST_UTILS_H__
+#define __G_HOST_UTILS_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_HOST_UTILS_H__
-#define __G_HOST_UTILS_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/giochannel.h b/glib/giochannel.h
index 013ee19..f7536d4 100644
--- a/glib/giochannel.h
+++ b/glib/giochannel.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_IOCHANNEL_H__
+#define __G_IOCHANNEL_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_IOCHANNEL_H__
-#define __G_IOCHANNEL_H__
-
 #include <glib/gconvert.h>
 #include <glib/gmain.h>
 #include <glib/gstring.h>
diff --git a/glib/gkeyfile.h b/glib/gkeyfile.h
index 998bb7a..5ec571d 100644
--- a/glib/gkeyfile.h
+++ b/glib/gkeyfile.h
@@ -20,13 +20,13 @@
  *   Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_KEY_FILE_H__
+#define __G_KEY_FILE_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_KEY_FILE_H__
-#define __G_KEY_FILE_H__
-
 #include <glib/gerror.h>
 
 G_BEGIN_DECLS
diff --git a/glib/glist.h b/glib/glist.h
index 44cfcc0..0dddc5b 100644
--- a/glib/glist.h
+++ b/glib/glist.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_LIST_H__
+#define __G_LIST_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_LIST_H__
-#define __G_LIST_H__
-
 #include <glib/gmem.h>
 #include <glib/gnode.h>
 
diff --git a/glib/gmacros.h b/glib/gmacros.h
index 4ad57da..a50d871 100644
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -28,13 +28,13 @@
  * not refer to variables from glibconfig.h
  */
 
+#ifndef __G_MACROS_H__
+#define __G_MACROS_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_MACROS_H__
-#define __G_MACROS_H__
-
 /* We include stddef.h to get the system's definition of NULL
  */
 #include <stddef.h>
diff --git a/glib/gmain-internal.h b/glib/gmain-internal.h
index 648aff3..97775ca 100644
--- a/glib/gmain-internal.h
+++ b/glib/gmain-internal.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_MAIN_INTERNAL_H__
+#define __G_MAIN_INTERNAL_H__
+
 #if !defined (GLIB_COMPILATION)
 #error "This is a private header"
 #endif
 
-#ifndef __G_MAIN_INTERNAL_H__
-#define __G_MAIN_INTERNAL_H__
-
 #include "gmain.h"
 
 G_BEGIN_DECLS
diff --git a/glib/gmain.h b/glib/gmain.h
index 4d4d504..23dc7be 100644
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_MAIN_H__
+#define __G_MAIN_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_MAIN_H__
-#define __G_MAIN_H__
-
 #include <glib/gpoll.h>
 #include <glib/gslist.h>
 #include <glib/gthread.h>
diff --git a/glib/gmappedfile.h b/glib/gmappedfile.h
index cf122e4..be8b9c5 100644
--- a/glib/gmappedfile.h
+++ b/glib/gmappedfile.h
@@ -19,13 +19,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_MAPPED_FILE_H__
+#define __G_MAPPED_FILE_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_MAPPED_FILE_H__
-#define __G_MAPPED_FILE_H__
-
 #include <glib/gbytes.h>
 #include <glib/gerror.h>
 
diff --git a/glib/gmarkup.h b/glib/gmarkup.h
index a8865da..b50df4f 100644
--- a/glib/gmarkup.h
+++ b/glib/gmarkup.h
@@ -18,13 +18,13 @@
  *   Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_MARKUP_H__
+#define __G_MARKUP_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_MARKUP_H__
-#define __G_MARKUP_H__
-
 #include <stdarg.h>
 
 #include <glib/gerror.h>
diff --git a/glib/gmem.h b/glib/gmem.h
index c50f46e..2f75c7d 100644
--- a/glib/gmem.h
+++ b/glib/gmem.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_MEM_H__
+#define __G_MEM_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_MEM_H__
-#define __G_MEM_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gmessages.h b/glib/gmessages.h
index 9cbcc83..777cda2 100644
--- a/glib/gmessages.h
+++ b/glib/gmessages.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_MESSAGES_H__
+#define __G_MESSAGES_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_MESSAGES_H__
-#define __G_MESSAGES_H__
-
 #include <stdarg.h>
 #include <glib/gtypes.h>
 #include <glib/gmacros.h>
diff --git a/glib/gnode.h b/glib/gnode.h
index 7ffdcbf..d970575 100644
--- a/glib/gnode.h
+++ b/glib/gnode.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_NODE_H__
+#define __G_NODE_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_NODE_H__
-#define __G_NODE_H__
-
 #include <glib/gmem.h>
 
 G_BEGIN_DECLS
diff --git a/glib/goption.h b/glib/goption.h
index 7d1f2a1..887b741 100644
--- a/glib/goption.h
+++ b/glib/goption.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_OPTION_H__
+#define __G_OPTION_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_OPTION_H__
-#define __G_OPTION_H__
-
 #include <glib/gerror.h>
 #include <glib/gquark.h>
 
diff --git a/glib/gpattern.h b/glib/gpattern.h
index e692d90..49bc678 100644
--- a/glib/gpattern.h
+++ b/glib/gpattern.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_PATTERN_H__
+#define __G_PATTERN_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_PATTERN_H__
-#define __G_PATTERN_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gpoll.h b/glib/gpoll.h
index f28b758..a417a04 100644
--- a/glib/gpoll.h
+++ b/glib/gpoll.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_POLL_H__
+#define __G_POLL_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (__G_MAIN_H__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_POLL_H__
-#define __G_POLL_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gprimes.h b/glib/gprimes.h
index 19f5702..c8fb854 100644
--- a/glib/gprimes.h
+++ b/glib/gprimes.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_PRIMES_H__
+#define __G_PRIMES_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_PRIMES_H__
-#define __G_PRIMES_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gqsort.h b/glib/gqsort.h
index 05b4b66..2f3f725 100644
--- a/glib/gqsort.h
+++ b/glib/gqsort.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_QSORT_H__
+#define __G_QSORT_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_QSORT_H__
-#define __G_QSORT_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gquark.h b/glib/gquark.h
index 39d22ab..ac1ed2f 100644
--- a/glib/gquark.h
+++ b/glib/gquark.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_QUARK_H__
+#define __G_QUARK_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_QUARK_H__
-#define __G_QUARK_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gqueue.h b/glib/gqueue.h
index 1d13eef..06ffa98 100644
--- a/glib/gqueue.h
+++ b/glib/gqueue.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_QUEUE_H__
+#define __G_QUEUE_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_QUEUE_H__
-#define __G_QUEUE_H__
-
 #include <glib/glist.h>
 
 G_BEGIN_DECLS
diff --git a/glib/grand.h b/glib/grand.h
index 182616b..07d0c25 100644
--- a/glib/grand.h
+++ b/glib/grand.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_RAND_H__
+#define __G_RAND_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_RAND_H__
-#define __G_RAND_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gregex.h b/glib/gregex.h
index 53a2aee..7543485 100644
--- a/glib/gregex.h
+++ b/glib/gregex.h
@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef __G_REGEX_H__
+#define __G_REGEX_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_REGEX_H__
-#define __G_REGEX_H__
-
 #include <glib/gerror.h>
 #include <glib/gstring.h>
 
diff --git a/glib/gscanner.h b/glib/gscanner.h
index dd932f4..fcf1638 100644
--- a/glib/gscanner.h
+++ b/glib/gscanner.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_SCANNER_H__
+#define __G_SCANNER_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_SCANNER_H__
-#define __G_SCANNER_H__
-
 #include <glib/gdataset.h>
 #include <glib/ghash.h>
 
diff --git a/glib/gsequence.h b/glib/gsequence.h
index 3e5a03d..50d2561 100644
--- a/glib/gsequence.h
+++ b/glib/gsequence.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_SEQUENCE_H__
+#define __G_SEQUENCE_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_SEQUENCE_H__
-#define __G_SEQUENCE_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gshell.h b/glib/gshell.h
index ddb4ec5..2eee164 100644
--- a/glib/gshell.h
+++ b/glib/gshell.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_SHELL_H__
+#define __G_SHELL_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_SHELL_H__
-#define __G_SHELL_H__
-
 #include <glib/gerror.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gslice.h b/glib/gslice.h
index 7e0c5b1..6aa83fe 100644
--- a/glib/gslice.h
+++ b/glib/gslice.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_SLICE_H__
+#define __G_SLICE_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_SLICE_H__
-#define __G_SLICE_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gslist.h b/glib/gslist.h
index c61fd2f..872b40d 100644
--- a/glib/gslist.h
+++ b/glib/gslist.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_SLIST_H__
+#define __G_SLIST_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_SLIST_H__
-#define __G_SLIST_H__
-
 #include <glib/gmem.h>
 #include <glib/gnode.h>
 
diff --git a/glib/gspawn.h b/glib/gspawn.h
index 3145641..22d7986 100644
--- a/glib/gspawn.h
+++ b/glib/gspawn.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_SPAWN_H__
+#define __G_SPAWN_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_SPAWN_H__
-#define __G_SPAWN_H__
-
 #include <glib/gerror.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
index 68c89fd..3142485 100644
--- a/glib/gstrfuncs.h
+++ b/glib/gstrfuncs.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_STRFUNCS_H__
+#define __G_STRFUNCS_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_STRFUNCS_H__
-#define __G_STRFUNCS_H__
-
 #include <stdarg.h>
 #include <glib/gmacros.h>
 #include <glib/gtypes.h>
diff --git a/glib/gstring.h b/glib/gstring.h
index 7543490..a97aa4e 100644
--- a/glib/gstring.h
+++ b/glib/gstring.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_STRING_H__
+#define __G_STRING_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_STRING_H__
-#define __G_STRING_H__
-
 #include <glib/gtypes.h>
 #include <glib/gunicode.h>
 #include <glib/gbytes.h>
diff --git a/glib/gstringchunk.h b/glib/gstringchunk.h
index 5ab2e8a..67234ec 100644
--- a/glib/gstringchunk.h
+++ b/glib/gstringchunk.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_STRINGCHUNK_H__
+#define __G_STRINGCHUNK_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_STRINGCHUNK_H__
-#define __G_STRINGCHUNK_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gtestutils.h b/glib/gtestutils.h
index 3721519..977852f 100644
--- a/glib/gtestutils.h
+++ b/glib/gtestutils.h
@@ -18,13 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_TEST_UTILS_H__
+#define __G_TEST_UTILS_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_TEST_UTILS_H__
-#define __G_TEST_UTILS_H__
-
 #include <glib/gmessages.h>
 #include <glib/gstring.h>
 #include <glib/gerror.h>
diff --git a/glib/gthread.h b/glib/gthread.h
index 710b64d..b5646d4 100644
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_THREAD_H__
+#define __G_THREAD_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_THREAD_H__
-#define __G_THREAD_H__
-
 #include <glib/gatomic.h>
 #include <glib/gerror.h>
 
diff --git a/glib/gthreadpool.h b/glib/gthreadpool.h
index 3a1f298..dab7f73 100644
--- a/glib/gthreadpool.h
+++ b/glib/gthreadpool.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_THREADPOOL_H__
+#define __G_THREADPOOL_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_THREADPOOL_H__
-#define __G_THREADPOOL_H__
-
 #include <glib/gthread.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gtimer.h b/glib/gtimer.h
index b927fc3..d0df427 100644
--- a/glib/gtimer.h
+++ b/glib/gtimer.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_TIMER_H__
+#define __G_TIMER_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_TIMER_H__
-#define __G_TIMER_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gtimezone.h b/glib/gtimezone.h
index c877e8f..2e1f647 100644
--- a/glib/gtimezone.h
+++ b/glib/gtimezone.h
@@ -19,13 +19,13 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_TIME_ZONE_H__
+#define __G_TIME_ZONE_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_TIME_ZONE_H__
-#define __G_TIME_ZONE_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gtrashstack.h b/glib/gtrashstack.h
index 3f226fe..bff504d 100644
--- a/glib/gtrashstack.h
+++ b/glib/gtrashstack.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_TRASH_STACK_H__
+#define __G_TRASH_STACK_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_TRASH_STACK_H__
-#define __G_TRASH_STACK_H__
-
 #include <glib/gutils.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gtree.h b/glib/gtree.h
index e17a518..fb9007b 100644
--- a/glib/gtree.h
+++ b/glib/gtree.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_TREE_H__
+#define __G_TREE_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_TREE_H__
-#define __G_TREE_H__
-
 #include <glib/gnode.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gtypes.h b/glib/gtypes.h
index 7e4c8ea..593f0be 100644
--- a/glib/gtypes.h
+++ b/glib/gtypes.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_TYPES_H__
+#define __G_TYPES_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_TYPES_H__
-#define __G_TYPES_H__
-
 #include <glibconfig.h>
 #include <glib/gmacros.h>
 #include <glib/gversionmacros.h>
diff --git a/glib/gunicode.h b/glib/gunicode.h
index aee9913..93c31e4 100644
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -19,13 +19,13 @@
  *   Boston, MA 02111-1307, USA.
  */
 
+#ifndef __G_UNICODE_H__
+#define __G_UNICODE_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_UNICODE_H__
-#define __G_UNICODE_H__
-
 #include <glib/gerror.h>
 #include <glib/gtypes.h>
 
diff --git a/glib/gurifuncs.h b/glib/gurifuncs.h
index 6e6b739..dda026b 100644
--- a/glib/gurifuncs.h
+++ b/glib/gurifuncs.h
@@ -20,13 +20,13 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_URI_FUNCS_H__
+#define __G_URI_FUNCS_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_URI_FUNCS_H__
-#define __G_URI_FUNCS_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gutils.h b/glib/gutils.h
index c256800..15f1ed9 100644
--- a/glib/gutils.h
+++ b/glib/gutils.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_UTILS_H__
+#define __G_UTILS_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_UTILS_H__
-#define __G_UTILS_H__
-
 #include <glib/gtypes.h>
 #include <stdarg.h>
 
diff --git a/glib/gvariant.h b/glib/gvariant.h
index fc66116..ca3bc1c 100644
--- a/glib/gvariant.h
+++ b/glib/gvariant.h
@@ -20,13 +20,13 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_VARIANT_H__
+#define __G_VARIANT_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_VARIANT_H__
-#define __G_VARIANT_H__
-
 #include <glib/gvarianttype.h>
 #include <glib/gstring.h>
 #include <glib/gbytes.h>
diff --git a/glib/gvarianttype.h b/glib/gvarianttype.h
index fe1ba84..4c312ef 100644
--- a/glib/gvarianttype.h
+++ b/glib/gvarianttype.h
@@ -20,13 +20,13 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_VARIANT_TYPE_H__
+#define __G_VARIANT_TYPE_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_VARIANT_TYPE_H__
-#define __G_VARIANT_TYPE_H__
-
 #include <glib/gmessages.h>
 #include <glib/gtypes.h>
 
diff --git a/glib/gversion.h b/glib/gversion.h
index d0581c2..9087d39 100644
--- a/glib/gversion.h
+++ b/glib/gversion.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_VERSION_H__
+#define __G_VERSION_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_VERSION_H__
-#define __G_VERSION_H__
-
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
diff --git a/glib/gversionmacros.h b/glib/gversionmacros.h
index 04718ce..9b5cfd0 100644
--- a/glib/gversionmacros.h
+++ b/glib/gversionmacros.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_VERSION_MACROS_H__
+#define __G_VERSION_MACROS_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_VERSION_MACROS_H__
-#define __G_VERSION_MACROS_H__
-
 /* Version boundaries checks */
 
 #define G_ENCODE_VERSION(major,minor)   ((major) << 16 | (minor) << 8)
diff --git a/glib/gwin32.h b/glib/gwin32.h
index 03a1f11..7f1b2bf 100644
--- a/glib/gwin32.h
+++ b/glib/gwin32.h
@@ -24,13 +24,13 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __G_WIN32_H__
+#define __G_WIN32_H__
+
 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
-#ifndef __G_WIN32_H__
-#define __G_WIN32_H__
-
 #include <glib/gtypes.h>
 
 #ifdef G_PLATFORM_WIN32
diff --git a/gobject/gatomicarray.h b/gobject/gatomicarray.h
index 4d4b3d5..b2ad970 100644
--- a/gobject/gatomicarray.h
+++ b/gobject/gatomicarray.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef __G_ATOMIC_ARRAY_H__
+#define __G_ATOMIC_ARRAY_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_ATOMIC_ARRAY_H__
-#define __G_ATOMIC_ARRAY_H__
-
 #include <glib/glib.h>
 
 G_BEGIN_DECLS
diff --git a/gobject/gbinding.h b/gobject/gbinding.h
index 1b71540..fbc6964 100644
--- a/gobject/gbinding.h
+++ b/gobject/gbinding.h
@@ -20,13 +20,13 @@
  * Author: Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
+#ifndef __G_BINDING_H__
+#define __G_BINDING_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_BINDING_H__
-#define __G_BINDING_H__
-
 #include <glib.h>
 #include <gobject/gobject.h>
 
diff --git a/gobject/gboxed.h b/gobject/gboxed.h
index 2b84087..ba7d67a 100644
--- a/gobject/gboxed.h
+++ b/gobject/gboxed.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef __G_BOXED_H__
+#define __G_BOXED_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_BOXED_H__
-#define __G_BOXED_H__
-
 #include        <gobject/gtype.h>
 
 #ifndef __GI_SCANNER__
diff --git a/gobject/gclosure.h b/gobject/gclosure.h
index fffac58..2d45430 100644
--- a/gobject/gclosure.h
+++ b/gobject/gclosure.h
@@ -17,13 +17,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef __G_CLOSURE_H__
+#define __G_CLOSURE_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_CLOSURE_H__
-#define __G_CLOSURE_H__
-
 #include        <gobject/gtype.h>
 
 G_BEGIN_DECLS
diff --git a/gobject/genums.h b/gobject/genums.h
index bf8a419..4ca006e 100644
--- a/gobject/genums.h
+++ b/gobject/genums.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef __G_ENUMS_H__
+#define __G_ENUMS_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_ENUMS_H__
-#define __G_ENUMS_H__
-
 #include <gobject/gtype.h>
 
 G_BEGIN_DECLS
diff --git a/gobject/glib-types.h b/gobject/glib-types.h
index f30139b..6b14585 100644
--- a/gobject/glib-types.h
+++ b/gobject/glib-types.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef __GLIB_TYPES_H__
+#define __GLIB_TYPES_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION) && !defined(GLIB_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __GLIB_TYPES_H__
-#define __GLIB_TYPES_H__
-
 #include <glib.h>
 
 G_BEGIN_DECLS
diff --git a/gobject/gobject.h b/gobject/gobject.h
index 9dcf997..74044fe 100644
--- a/gobject/gobject.h
+++ b/gobject/gobject.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef __G_OBJECT_H__
+#define __G_OBJECT_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_OBJECT_H__
-#define __G_OBJECT_H__
-
 #include        <gobject/gtype.h>
 #include        <gobject/gvalue.h>
 #include        <gobject/gparam.h>
diff --git a/gobject/gparam.h b/gobject/gparam.h
index 84b3c44..763f41a 100644
--- a/gobject/gparam.h
+++ b/gobject/gparam.h
@@ -18,13 +18,13 @@
  *
  * gparam.h: GParamSpec base class implementation
  */
+#ifndef __G_PARAM_H__
+#define __G_PARAM_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_PARAM_H__
-#define __G_PARAM_H__
-
 #include	<gobject/gvalue.h>
 
 G_BEGIN_DECLS
diff --git a/gobject/gparamspecs.h b/gobject/gparamspecs.h
index 3e0ff6e..bdb1459 100644
--- a/gobject/gparamspecs.h
+++ b/gobject/gparamspecs.h
@@ -18,13 +18,13 @@
  *
  * gparamspecs.h: GLib default param specs
  */
+#ifndef __G_PARAMSPECS_H__
+#define __G_PARAMSPECS_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_PARAMSPECS_H__
-#define __G_PARAMSPECS_H__
-
 #include        <gobject/gvalue.h>
 #include        <gobject/genums.h>
 #include        <gobject/gboxed.h>
diff --git a/gobject/gsignal.h b/gobject/gsignal.h
index fbf1c19..a5f2cfc 100644
--- a/gobject/gsignal.h
+++ b/gobject/gsignal.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef __G_SIGNAL_H__
+#define __G_SIGNAL_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_SIGNAL_H__
-#define __G_SIGNAL_H__
-
 #include	<gobject/gclosure.h>
 #include	<gobject/gvalue.h>
 #include	<gobject/gparam.h>
diff --git a/gobject/gsourceclosure.h b/gobject/gsourceclosure.h
index 3cfdacd..d1aabd9 100644
--- a/gobject/gsourceclosure.h
+++ b/gobject/gsourceclosure.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef __G_SOURCECLOSURE_H__
+#define __G_SOURCECLOSURE_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_SOURCECLOSURE_H__
-#define __G_SOURCECLOSURE_H__
-
 #include <gobject/gclosure.h>
 #include <gobject/glib-types.h>
 
diff --git a/gobject/gtype-private.h b/gobject/gtype-private.h
index 04a252b..5c415e5 100644
--- a/gobject/gtype-private.h
+++ b/gobject/gtype-private.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef __G_TYPE_PRIVATE_H__
+#define __G_TYPE_PRIVATE_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_TYPE_PRIVATE_H__
-#define __G_TYPE_PRIVATE_H__
-
 #include "gboxed.h"
 #include "gclosure.h"
 
diff --git a/gobject/gtype.h b/gobject/gtype.h
index 80a4ddf..4f838c9 100644
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef __G_TYPE_H__
+#define __G_TYPE_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_TYPE_H__
-#define __G_TYPE_H__
-
 #include        <glib.h>
 
 G_BEGIN_DECLS
diff --git a/gobject/gtypemodule.h b/gobject/gtypemodule.h
index f2d524b..791dbad 100644
--- a/gobject/gtypemodule.h
+++ b/gobject/gtypemodule.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef __G_TYPE_MODULE_H__
+#define __G_TYPE_MODULE_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_TYPE_MODULE_H__
-#define __G_TYPE_MODULE_H__
-
 #include <gobject/gobject.h>
 #include <gobject/genums.h>
 
diff --git a/gobject/gtypeplugin.h b/gobject/gtypeplugin.h
index ff87a70..7365d68 100644
--- a/gobject/gtypeplugin.h
+++ b/gobject/gtypeplugin.h
@@ -16,13 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef __G_TYPE_PLUGIN_H__
+#define __G_TYPE_PLUGIN_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_TYPE_PLUGIN_H__
-#define __G_TYPE_PLUGIN_H__
-
 #include	<gobject/gtype.h>
 
 G_BEGIN_DECLS
diff --git a/gobject/gvalue.h b/gobject/gvalue.h
index 7bebfb1..15e0a7e 100644
--- a/gobject/gvalue.h
+++ b/gobject/gvalue.h
@@ -18,13 +18,13 @@
  *
  * gvalue.h: generic GValue functions
  */
+#ifndef __G_VALUE_H__
+#define __G_VALUE_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_VALUE_H__
-#define __G_VALUE_H__
-
 #include	<gobject/gtype.h>
 
 G_BEGIN_DECLS
diff --git a/gobject/gvaluearray.h b/gobject/gvaluearray.h
index de14934..1570818 100644
--- a/gobject/gvaluearray.h
+++ b/gobject/gvaluearray.h
@@ -18,13 +18,13 @@
  *
  * gvaluearray.h: GLib array type holding GValues
  */
+#ifndef __G_VALUE_ARRAY_H__
+#define __G_VALUE_ARRAY_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_VALUE_ARRAY_H__
-#define __G_VALUE_ARRAY_H__
-
 #include	<gobject/gvalue.h>
 
 G_BEGIN_DECLS
diff --git a/gobject/gvaluetypes.h b/gobject/gvaluetypes.h
index 584162e..fb79d20 100644
--- a/gobject/gvaluetypes.h
+++ b/gobject/gvaluetypes.h
@@ -18,13 +18,13 @@
  *
  * gvaluetypes.h: GLib default values
  */
+#ifndef __G_VALUETYPES_H__
+#define __G_VALUETYPES_H__
+
 #if !defined (__GLIB_GOBJECT_H_INSIDE__) && !defined (GOBJECT_COMPILATION)
 #error "Only <glib-object.h> can be included directly."
 #endif
 
-#ifndef __G_VALUETYPES_H__
-#define __G_VALUETYPES_H__
-
 #include	<gobject/gvalue.h>
 
 G_BEGIN_DECLS
