Move single-include guards inside include guards

gcc has optimizations for include guards that only work
if they are outermost in the the header.
https://bugzilla.gnome.org/show_bug.cgi?id=689810

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

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

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

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

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

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

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

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>
 

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

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

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

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

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

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

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

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>
 

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>
 

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

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

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

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

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

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

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

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>
 

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>
 

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>
 

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

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

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

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

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

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

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

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

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

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>
 

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

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

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

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

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

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>
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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>
 

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>
 

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

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>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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>
 

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

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"
 

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

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

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

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

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

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

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

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>