summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2012-12-27 23:43:14 -0500
committerMatthias Clasen <mclasen@redhat.com>2012-12-27 23:43:14 -0500
commite1b99b2ddcf21f5dab26ad74afa6935eaf70028e (patch)
tree100335f4c2ef9e04d58964389985b8f71a98b58a
parent89d48d7800a21db1b94c09644bc68b84cda1940b (diff)
downloadglib-e1b99b2ddcf21f5dab26ad74afa6935eaf70028e.tar.gz
Move single-include guards inside include guards
gcc has optimizations for include guards that only work if they are outermost in the the header. https://bugzilla.gnome.org/show_bug.cgi?id=689810
-rw-r--r--gio/gaction.h6
-rw-r--r--gio/gactiongroup.h6
-rw-r--r--gio/gactiongroupexporter.h6
-rw-r--r--gio/gactionmap.h6
-rw-r--r--gio/gappinfo.h6
-rw-r--r--gio/gapplication.h6
-rw-r--r--gio/gapplicationcommandline.h6
-rw-r--r--gio/gasyncinitable.h6
-rw-r--r--gio/gasyncresult.h6
-rw-r--r--gio/gbufferedinputstream.h6
-rw-r--r--gio/gbufferedoutputstream.h6
-rw-r--r--gio/gcancellable.h6
-rw-r--r--gio/gcharsetconverter.h6
-rw-r--r--gio/gcontenttype.h6
-rw-r--r--gio/gconverter.h6
-rw-r--r--gio/gconverterinputstream.h6
-rw-r--r--gio/gconverteroutputstream.h6
-rw-r--r--gio/gcredentials.h6
-rw-r--r--gio/gdatainputstream.h6
-rw-r--r--gio/gdataoutputstream.h6
-rw-r--r--gio/gdbusactiongroup.h6
-rw-r--r--gio/gdbusaddress.h6
-rw-r--r--gio/gdbusauth.h6
-rw-r--r--gio/gdbusauthmechanism.h6
-rw-r--r--gio/gdbusauthmechanismanon.h6
-rw-r--r--gio/gdbusauthmechanismexternal.h6
-rw-r--r--gio/gdbusauthmechanismsha1.h6
-rw-r--r--gio/gdbusauthobserver.h6
-rw-r--r--gio/gdbusconnection.h6
-rw-r--r--gio/gdbuserror.h6
-rw-r--r--gio/gdbusintrospection.h6
-rw-r--r--gio/gdbusmessage.h6
-rw-r--r--gio/gdbusmethodinvocation.h6
-rw-r--r--gio/gdbusnameowning.h6
-rw-r--r--gio/gdbusnamewatching.h6
-rw-r--r--gio/gdbusprivate.h6
-rw-r--r--gio/gdbusproxy.h6
-rw-r--r--gio/gdbusserver.h6
-rw-r--r--gio/gdbusutils.h6
-rw-r--r--gio/gdrive.h6
-rw-r--r--gio/gdummyproxyresolver.h6
-rw-r--r--gio/gemblem.h6
-rw-r--r--gio/gemblemedicon.h6
-rw-r--r--gio/gfile.h6
-rw-r--r--gio/gfileattribute.h6
-rw-r--r--gio/gfileenumerator.h6
-rw-r--r--gio/gfileicon.h6
-rw-r--r--gio/gfileinfo.h6
-rw-r--r--gio/gfileinputstream.h6
-rw-r--r--gio/gfileiostream.h6
-rw-r--r--gio/gfilemonitor.h6
-rw-r--r--gio/gfilenamecompleter.h6
-rw-r--r--gio/gfileoutputstream.h6
-rw-r--r--gio/gfilterinputstream.h6
-rw-r--r--gio/gfilteroutputstream.h6
-rw-r--r--gio/gicon.h6
-rw-r--r--gio/ginetaddress.h6
-rw-r--r--gio/ginetaddressmask.h6
-rw-r--r--gio/ginetsocketaddress.h6
-rw-r--r--gio/ginitable.h6
-rw-r--r--gio/ginputstream.h6
-rw-r--r--gio/gioenums.h6
-rw-r--r--gio/gioerror.h6
-rw-r--r--gio/giomodule.h6
-rw-r--r--gio/gioscheduler.h6
-rw-r--r--gio/giostream.h6
-rw-r--r--gio/giotypes.h6
-rw-r--r--gio/gloadableicon.h6
-rw-r--r--gio/gmemoryinputstream.h6
-rw-r--r--gio/gmemoryoutputstream.h6
-rw-r--r--gio/gmount.h6
-rw-r--r--gio/gmountoperation.h6
-rw-r--r--gio/gnativevolumemonitor.h6
-rw-r--r--gio/gnetworkaddress.h6
-rw-r--r--gio/gnetworkmonitor.h6
-rw-r--r--gio/gnetworkservice.h6
-rw-r--r--gio/goutputstream.h6
-rw-r--r--gio/gpermission.h6
-rw-r--r--gio/gpollableinputstream.h6
-rw-r--r--gio/gpollableoutputstream.h6
-rw-r--r--gio/gpollableutils.h6
-rw-r--r--gio/gproxy.h6
-rw-r--r--gio/gproxyaddress.h6
-rw-r--r--gio/gproxyaddressenumerator.h6
-rw-r--r--gio/gproxyresolver.h6
-rw-r--r--gio/gremoteactiongroup.h6
-rw-r--r--gio/gresolver.h6
-rw-r--r--gio/gresource.h6
-rw-r--r--gio/gseekable.h6
-rw-r--r--gio/gsettings.h6
-rw-r--r--gio/gsimpleaction.h6
-rw-r--r--gio/gsimpleactiongroup.h6
-rw-r--r--gio/gsimpleasyncresult.h6
-rw-r--r--gio/gsimplepermission.h6
-rw-r--r--gio/gsocket.h6
-rw-r--r--gio/gsocketaddress.h6
-rw-r--r--gio/gsocketaddressenumerator.h6
-rw-r--r--gio/gsocketclient.h6
-rw-r--r--gio/gsocketconnectable.h6
-rw-r--r--gio/gsocketconnection.h6
-rw-r--r--gio/gsocketcontrolmessage.h6
-rw-r--r--gio/gsocketlistener.h6
-rw-r--r--gio/gsocketservice.h6
-rw-r--r--gio/gsrvtarget.h6
-rw-r--r--gio/gtask.h6
-rw-r--r--gio/gtcpconnection.h6
-rw-r--r--gio/gtcpwrapperconnection.h6
-rw-r--r--gio/gtestdbus.h6
-rw-r--r--gio/gthemedicon.h6
-rw-r--r--gio/gthreadedsocketservice.h6
-rw-r--r--gio/gtlsbackend.h6
-rw-r--r--gio/gtlscertificate.h6
-rw-r--r--gio/gtlsclientconnection.h6
-rw-r--r--gio/gtlsconnection.h6
-rw-r--r--gio/gtlsdatabase.h6
-rw-r--r--gio/gtlsfiledatabase.h6
-rw-r--r--gio/gtlsinteraction.h6
-rw-r--r--gio/gtlspassword.h6
-rw-r--r--gio/gtlsserverconnection.h6
-rw-r--r--gio/gvfs.h6
-rw-r--r--gio/gvolume.h6
-rw-r--r--gio/gvolumemonitor.h6
-rw-r--r--gio/gzlibcompressor.h6
-rw-r--r--gio/gzlibdecompressor.h6
-rw-r--r--glib/deprecated/gallocator.h6
-rw-r--r--glib/deprecated/gcache.h6
-rw-r--r--glib/deprecated/gcompletion.h6
-rw-r--r--glib/deprecated/gmain.h6
-rw-r--r--glib/deprecated/grel.h6
-rw-r--r--glib/deprecated/gthread.h6
-rw-r--r--glib/galloca.h6
-rw-r--r--glib/garray.h6
-rw-r--r--glib/gasyncqueue.h6
-rw-r--r--glib/gatomic.h6
-rw-r--r--glib/gbacktrace.h6
-rw-r--r--glib/gbase64.h6
-rw-r--r--glib/gbookmarkfile.h6
-rw-r--r--glib/gbytes.h6
-rw-r--r--glib/gcharset.h6
-rw-r--r--glib/gchecksum.h6
-rw-r--r--glib/gconvert.h6
-rw-r--r--glib/gdataset.h6
-rw-r--r--glib/gdate.h6
-rw-r--r--glib/gdatetime.h6
-rw-r--r--glib/gdir.h6
-rw-r--r--glib/genviron.h6
-rw-r--r--glib/gerror.h6
-rw-r--r--glib/gfileutils.h6
-rw-r--r--glib/ggettext.h6
-rw-r--r--glib/ghash.h6
-rw-r--r--glib/ghmac.h6
-rw-r--r--glib/ghook.h6
-rw-r--r--glib/ghostutils.h6
-rw-r--r--glib/giochannel.h6
-rw-r--r--glib/gkeyfile.h6
-rw-r--r--glib/glist.h6
-rw-r--r--glib/gmacros.h6
-rw-r--r--glib/gmain-internal.h6
-rw-r--r--glib/gmain.h6
-rw-r--r--glib/gmappedfile.h6
-rw-r--r--glib/gmarkup.h6
-rw-r--r--glib/gmem.h6
-rw-r--r--glib/gmessages.h6
-rw-r--r--glib/gnode.h6
-rw-r--r--glib/goption.h6
-rw-r--r--glib/gpattern.h6
-rw-r--r--glib/gpoll.h6
-rw-r--r--glib/gprimes.h6
-rw-r--r--glib/gqsort.h6
-rw-r--r--glib/gquark.h6
-rw-r--r--glib/gqueue.h6
-rw-r--r--glib/grand.h6
-rw-r--r--glib/gregex.h6
-rw-r--r--glib/gscanner.h6
-rw-r--r--glib/gsequence.h6
-rw-r--r--glib/gshell.h6
-rw-r--r--glib/gslice.h6
-rw-r--r--glib/gslist.h6
-rw-r--r--glib/gspawn.h6
-rw-r--r--glib/gstrfuncs.h6
-rw-r--r--glib/gstring.h6
-rw-r--r--glib/gstringchunk.h6
-rw-r--r--glib/gtestutils.h6
-rw-r--r--glib/gthread.h6
-rw-r--r--glib/gthreadpool.h6
-rw-r--r--glib/gtimer.h6
-rw-r--r--glib/gtimezone.h6
-rw-r--r--glib/gtrashstack.h6
-rw-r--r--glib/gtree.h6
-rw-r--r--glib/gtypes.h6
-rw-r--r--glib/gunicode.h6
-rw-r--r--glib/gurifuncs.h6
-rw-r--r--glib/gutils.h6
-rw-r--r--glib/gvariant.h6
-rw-r--r--glib/gvarianttype.h6
-rw-r--r--glib/gversion.h6
-rw-r--r--glib/gversionmacros.h6
-rw-r--r--glib/gwin32.h6
-rw-r--r--gobject/gatomicarray.h6
-rw-r--r--gobject/gbinding.h6
-rw-r--r--gobject/gboxed.h6
-rw-r--r--gobject/gclosure.h6
-rw-r--r--gobject/genums.h6
-rw-r--r--gobject/glib-types.h6
-rw-r--r--gobject/gobject.h6
-rw-r--r--gobject/gparam.h6
-rw-r--r--gobject/gparamspecs.h6
-rw-r--r--gobject/gsignal.h6
-rw-r--r--gobject/gsourceclosure.h6
-rw-r--r--gobject/gtype-private.h6
-rw-r--r--gobject/gtype.h6
-rw-r--r--gobject/gtypemodule.h6
-rw-r--r--gobject/gtypeplugin.h6
-rw-r--r--gobject/gvalue.h6
-rw-r--r--gobject/gvaluearray.h6
-rw-r--r--gobject/gvaluetypes.h6
216 files changed, 648 insertions, 648 deletions
diff --git a/gio/gaction.h b/gio/gaction.h
index 0a4e8c395..305ff27b0 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 b300aefd5..f93dc4f6f 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 eaa18e66a..31f21f219 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 6e7a7315b..93451a8ef 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 a27e58be8..7ebf14824 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 f913cc571..f5b692098 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 cf5e5e093..d0f6135af 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 844282157..1b1004df7 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 e898401a3..cb3f967d9 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 029426c21..f5dfe50b9 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 0d84790be..d000331f1 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 d8fa63368..a2b751da1 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 5198d4639..4e7254d0e 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 d7ba23ea3..04af8374b 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 6770aaf9c..d98b92cf0 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 8e4f1d4fd..1f534ccd9 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 ceac20084..3b6495733 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 ae4097274..6c9565786 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 0f205c65e..9612f1864 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 0fb3cbfea..fda076734 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 12a2f60c4..ed215a4cd 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 955c39e95..abd2c2e31 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 1ee3ec45e..0eee95c21 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 44829c0e5..2373a8895 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 744044e10..f5d69a7a3 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 ca4513654..b5f011fe7 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 6a70afa4a..7cb08f74c 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 ffb1ddf15..184e25a87 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 6c1ec5c3c..4ffdd9329 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 85e2f8815..d32b92893 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 884c733c1..239638d02 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 5c4febd26..f8328aa7f 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 b1a87ac9e..9146b21a5 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 fc4b92c93..9cef19d8f 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 a2bb6dc51..785072aab 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 1ac7754a3..3a6286772 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 1e920d309..8df564c4d 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 3d10c1b4b..49f949fb4 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 a05a23007..467d15132 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 d42b0b700..c4f9070f6 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 75bab7bbe..d5e091fe9 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 06816e121..65587acdc 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 ded692815..20c0c66b6 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 8e8b9a311..b1291efc2 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 445cdd77d..5982e1db4 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 9fcec1281..548c5f16e 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 08ae79190..5ae149174 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 98aeaae39..b9f379063 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 08c056e1b..380b81363 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 31497e38c..70fa8247a 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 8e27d22e0..64a065fe1 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 1899c27d5..0a7b498ad 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 3b5f85d3b..723e5df5c 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 1514104aa..1f1a5ecca 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 10350e5a0..428d5d36d 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 8f339f694..d126753e1 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 d523cd654..b91c71748 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 3c3a86c82..05b0630af 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 ab20235d7..1d833879a 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 1a2d13d9e..318efbe9c 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 e9b36f7ea..5f109c852 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 265ca315c..228066c3a 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 12c2b0621..5c153be2a 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 3a8a6f1c1..f3eaa40f2 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 431f06eb2..c044b820e 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 90283ddbd..09c365b56 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 82845c584..269609123 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 754090fe4..b23917df4 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 1625ae944..944df9b0e 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 8be37e6da..f85246162 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 337289202..f3b71e737 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 0c112658e..f57031aa1 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 e072576fe..8059bed8b 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 af163211d..281271de6 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 995ff5458..6a53a087c 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 1f6dbea86..0abac165d 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 5e9850c87..9502d4ae2 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 3f7425788..a4ea113b5 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 49af7ee2d..5903fe936 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 c5945ce33..572948d41 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 782f3ca4d..faf16c041 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 d7d11a7f5..4d2c483ba 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 8d51f11d6..c44fd9a7d 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 b38045f6f..6ce8916c3 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 7d8d27dea..5884dc855 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 d2849e63c..a9926ee63 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 ecd8e51d6..01243f1a3 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 79aad7a3b..2db343ca4 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 ba51eea5d..95df99d4a 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 01f3e9e15..918c93214 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 005d0e42d..d954d6696 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 5cba046b9..243cd4f6f 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 749763012..623336908 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 367fe895c..b9a362b54 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 6d54ef09b..e6eb3d19c 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 356e2b05b..f6119a105 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 c69be2f3a..6c636f3a1 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 216310b4e..e435dde07 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 0f84a4ae7..f22470600 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 0daa5f356..ac3f982ca 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 6af300c10..9b79b8284 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 da09a7845..d2b42986c 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 27cc0a262..67f3b0bdd 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 67ce2a9e4..ffd59f473 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 2cc5f65ff..bb032267b 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 3928825a4..adb02a0c6 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 01d3a03a8..26daf2a95 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 0fd281b42..00644d6b8 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 b0085e682..98445f6bb 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 f9470907e..3f43dd9eb 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 389b5d77f..b60d8abb7 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 991eb1d4d..97d98ac34 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 eaf62f0ba..599032ac2 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 37132cc83..68570c0e2 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 9f93cc917..96b7b3163 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 bc6a17ffd..5a7c20e49 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 fc76fe2df..755884262 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 ef581b61e..6bce9fede 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 c909d5503..8d75ac6af 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 bacbe8b60..c8bb46c24 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 b0d862e79..8f9b98c22 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 2bff07ed4..33a88ebb9 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 582478159..2aac66dcc 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 f7bb57dde..3cace75e0 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 e4990e901..a3dc2a1a7 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 2e5119b2c..a7854e07c 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 88a0479d8..fa775968e 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 d1ddf1979..bb6224087 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 c9e09962a..b76e00690 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 b882804c9..b7e6d93f5 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 1ecdf65c0..63c080fb1 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 eb37b92e0..be71c6390 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 f0d6d959a..96ae84ba4 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 8b52e0b3f..8c7d86744 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 f0a6eab92..5ce5fd4fb 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 88ce6d8ad..b7be775b1 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 6b2ee6f45..bd7f54eaa 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 de3c8f808..a3eda979b 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 9b56524c0..cbb197541 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 be6ab65a1..f7a74d101 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 e85556e0c..59280a326 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 a93f6ae99..8f5f98c29 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 5ef1850b9..205ca085d 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 6643e3ff2..396c07d42 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 2e734ac14..6727e9478 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 2f23b587c..eb16c48f1 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 6eb65fee9..f9020d62c 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 17b2acb95..90cab2e30 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 54bbaa8e3..b1b73a6ce 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 3eb891274..9cf01ada8 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 d03d71f32..94bc427e3 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 e7292ead7..73e2efb21 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 0349da364..e2733f564 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 013ee19a0..f7536d47e 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 998bb7a76..5ec571d62 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 44cfcc013..0dddc5b54 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 4ad57da36..a50d87124 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 648aff3e6..97775ca93 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 4d4d5043b..23dc7bea0 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 cf122e411..be8b9c500 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 a8865da9f..b50df4f97 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 c50f46e74..2f75c7d81 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 9cbcc8388..777cda238 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 7ffdcbfc5..d97057595 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 7d1f2a1de..887b741c2 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 e692d9022..49bc67817 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 f28b758e0..a417a04ad 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 19f570218..c8fb85446 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 05b4b66f3..2f3f725ff 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 39d22ab17..ac1ed2f1b 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 1d13eef83..06ffa98d9 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 182616b3c..07d0c25f0 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 53a2aeef1..75434850f 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 dd932f423..fcf1638db 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 3e5a03dea..50d2561d3 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 ddb4ec564..2eee164aa 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 7e0c5b1db..6aa83fec9 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 c61fd2ff6..872b40d75 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 3145641b9..22d7986e2 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 68c89fdb9..3142485a2 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 75434908a..a97aa4e8a 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 5ab2e8adf..67234ec76 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 372151922..977852f15 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 b9c3025a0..eb6029971 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 3a1f29806..dab7f73de 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 b927fc372..d0df42717 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 c877e8f4c..2e1f64760 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 3f226fe4c..bff504d10 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 e17a51828..fb9007ba0 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 7e4c8eaba..593f0be21 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 aee99135a..93c31e469 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 6e6b73917..dda026ba1 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 c256800eb..15f1ed9e3 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 fc661162e..ca3bc1c2d 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 fe1ba8444..4c312ef26 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 d0581c24a..9087d3957 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 04718ce57..9b5cfd075 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 03a1f1167..7f1b2bf3c 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 4d4b3d5dd..b2ad9705d 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 1b715402e..fbc696437 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 2b8408788..ba7d67a26 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 fffac5824..2d454305b 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 bf8a4191e..4ca006eeb 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 cc819e190..f36e21a4e 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 9dcf99712..74044feb6 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 84b3c445f..763f41a05 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 3e0ff6e3a..bdb1459fd 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 fbf1c19fe..a5f2cfcc0 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 3cfdacd5e..d1aabd931 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 04a252b9f..5c415e5d0 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 dec1d8976..ae59b0ec3 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 f2d524bd5..791dbaddb 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 ff87a7018..7365d6845 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 7bebfb143..15e0a7e03 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 de14934b3..1570818b6 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 584162eb2..fb79d20e1 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