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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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 <[email protected]>
  */
 
+#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