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

23 files changed, 72 insertions, 72 deletions

diff --git a/gtk/deprecated/gtkcolorsel.h b/gtk/deprecated/gtkcolorsel.h
index 3dd371257c..37212eb134 100644
--- a/gtk/deprecated/gtkcolorsel.h
+++ b/gtk/deprecated/gtkcolorsel.h
@@ -23,13 +23,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_COLOR_SELECTION_H__
+#define __GTK_COLOR_SELECTION_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COLOR_SELECTION_H__
-#define __GTK_COLOR_SELECTION_H__
-
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkbox.h>
 
diff --git a/gtk/deprecated/gtkcolorseldialog.h b/gtk/deprecated/gtkcolorseldialog.h
index 8a681ac138..3722466537 100644
--- a/gtk/deprecated/gtkcolorseldialog.h
+++ b/gtk/deprecated/gtkcolorseldialog.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_COLOR_SELECTION_DIALOG_H__
+#define __GTK_COLOR_SELECTION_DIALOG_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_COLOR_SELECTION_DIALOG_H__
-#define __GTK_COLOR_SELECTION_DIALOG_H__
-
 #include <gtk/gtkdialog.h>
 #include <gtk/deprecated/gtkcolorsel.h>
 
diff --git a/gtk/deprecated/gtkfontsel.h b/gtk/deprecated/gtkfontsel.h
index f33ad76684..1e72600154 100644
--- a/gtk/deprecated/gtkfontsel.h
+++ b/gtk/deprecated/gtkfontsel.h
@@ -26,14 +26,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_FONTSEL_H__
 #define __GTK_FONTSEL_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkbox.h>
 
diff --git a/gtk/deprecated/gtkgradient.h b/gtk/deprecated/gtkgradient.h
index 767461f4e4..fe6dc8cb02 100644
--- a/gtk/deprecated/gtkgradient.h
+++ b/gtk/deprecated/gtkgradient.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_GRADIENT_H__
+#define __GTK_GRADIENT_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_GRADIENT_H__
-#define __GTK_GRADIENT_H__
-
 #include <gdk/gdk.h>
 #include <gtk/gtkstylecontext.h>
 #include <gtk/gtkstyleproperties.h>
diff --git a/gtk/deprecated/gtkhandlebox.h b/gtk/deprecated/gtkhandlebox.h
index 0f84fc6956..9c618a813b 100644
--- a/gtk/deprecated/gtkhandlebox.h
+++ b/gtk/deprecated/gtkhandlebox.h
@@ -27,13 +27,13 @@
  * their parents.
  */
 
+#ifndef __GTK_HANDLE_BOX_H__
+#define __GTK_HANDLE_BOX_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_HANDLE_BOX_H__
-#define __GTK_HANDLE_BOX_H__
-
 #include <gtk/gtkbin.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkhbbox.h b/gtk/deprecated/gtkhbbox.h
index 26714c852c..a53d54a40c 100644
--- a/gtk/deprecated/gtkhbbox.h
+++ b/gtk/deprecated/gtkhbbox.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_HBUTTON_BOX_H__
+#define __GTK_HBUTTON_BOX_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_HBUTTON_BOX_H__
-#define __GTK_HBUTTON_BOX_H__
-
 #include <gtk/gtkbbox.h>
 
 
diff --git a/gtk/deprecated/gtkhbox.h b/gtk/deprecated/gtkhbox.h
index ec4f9c51ac..13e4d8aed0 100644
--- a/gtk/deprecated/gtkhbox.h
+++ b/gtk/deprecated/gtkhbox.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_HBOX_H__
 #define __GTK_HBOX_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbox.h>
 
 
diff --git a/gtk/deprecated/gtkhpaned.h b/gtk/deprecated/gtkhpaned.h
index e637939a54..da0bb62c47 100644
--- a/gtk/deprecated/gtkhpaned.h
+++ b/gtk/deprecated/gtkhpaned.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_HPANED_H__
+#define __GTK_HPANED_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_HPANED_H__
-#define __GTK_HPANED_H__
-
 #include <gtk/gtkpaned.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkhscale.h b/gtk/deprecated/gtkhscale.h
index 486a31f532..c9b9a0feee 100644
--- a/gtk/deprecated/gtkhscale.h
+++ b/gtk/deprecated/gtkhscale.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_HSCALE_H__
+#define __GTK_HSCALE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_HSCALE_H__
-#define __GTK_HSCALE_H__
-
 #include <gtk/gtkscale.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkhscrollbar.h b/gtk/deprecated/gtkhscrollbar.h
index c325c3c5e7..aa7253bf77 100644
--- a/gtk/deprecated/gtkhscrollbar.h
+++ b/gtk/deprecated/gtkhscrollbar.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_HSCROLLBAR_H__
+#define __GTK_HSCROLLBAR_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_HSCROLLBAR_H__
-#define __GTK_HSCROLLBAR_H__
-
 #include <gtk/gtkscrollbar.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkhseparator.h b/gtk/deprecated/gtkhseparator.h
index f9bdaa966a..e58fb4e0e1 100644
--- a/gtk/deprecated/gtkhseparator.h
+++ b/gtk/deprecated/gtkhseparator.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_HSEPARATOR_H__
+#define __GTK_HSEPARATOR_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_HSEPARATOR_H__
-#define __GTK_HSEPARATOR_H__
-
 #include <gtk/gtkseparator.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkhsv.h b/gtk/deprecated/gtkhsv.h
index 9f9436c9ab..b25f20be0d 100644
--- a/gtk/deprecated/gtkhsv.h
+++ b/gtk/deprecated/gtkhsv.h
@@ -27,13 +27,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_HSV_H__
+#define __GTK_HSV_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_HSV_H__
-#define __GTK_HSV_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkrc.h b/gtk/deprecated/gtkrc.h
index 2f1918312f..da913f410f 100644
--- a/gtk/deprecated/gtkrc.h
+++ b/gtk/deprecated/gtkrc.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_RC_H__
+#define __GTK_RC_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_RC_H__
-#define __GTK_RC_H__
-
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkstyle.h b/gtk/deprecated/gtkstyle.h
index 1dd7100969..0779f32326 100644
--- a/gtk/deprecated/gtkstyle.h
+++ b/gtk/deprecated/gtkstyle.h
@@ -22,14 +22,14 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_STYLE_H__
 #define __GTK_STYLE_H__
 
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
 #include <gtk/gtktypes.h>
diff --git a/gtk/deprecated/gtksymboliccolor.h b/gtk/deprecated/gtksymboliccolor.h
index 937f93562f..c109ca996d 100644
--- a/gtk/deprecated/gtksymboliccolor.h
+++ b/gtk/deprecated/gtksymboliccolor.h
@@ -15,13 +15,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_SYMBOLIC_COLOR_H__
+#define __GTK_SYMBOLIC_COLOR_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_SYMBOLIC_COLOR_H__
-#define __GTK_SYMBOLIC_COLOR_H__
-
 #include <gdk/gdk.h>
 #include <gtk/gtkstyleproperties.h>
 
diff --git a/gtk/deprecated/gtktable.h b/gtk/deprecated/gtktable.h
index bb53c7bbd2..021b215740 100644
--- a/gtk/deprecated/gtktable.h
+++ b/gtk/deprecated/gtktable.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_TABLE_H__
+#define __GTK_TABLE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TABLE_H__
-#define __GTK_TABLE_H__
-
 #include <gtk/gtkcontainer.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtktearoffmenuitem.h b/gtk/deprecated/gtktearoffmenuitem.h
index d20ea07849..224f0880d2 100644
--- a/gtk/deprecated/gtktearoffmenuitem.h
+++ b/gtk/deprecated/gtktearoffmenuitem.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_TEAROFF_MENU_ITEM_H__
+#define __GTK_TEAROFF_MENU_ITEM_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_TEAROFF_MENU_ITEM_H__
-#define __GTK_TEAROFF_MENU_ITEM_H__
-
 #include <gtk/gtkmenuitem.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkvbbox.h b/gtk/deprecated/gtkvbbox.h
index 04e64d18a0..93e461ff2a 100644
--- a/gtk/deprecated/gtkvbbox.h
+++ b/gtk/deprecated/gtkvbbox.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_VBBOX_H__
+#define __GTK_VBBOX_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_VBBOX_H__
-#define __GTK_VBBOX_H__
-
 #include <gtk/gtkbbox.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkvbox.h b/gtk/deprecated/gtkvbox.h
index 1dcc2a88f2..ae3759b67a 100644
--- a/gtk/deprecated/gtkvbox.h
+++ b/gtk/deprecated/gtkvbox.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_VBOX_H__
+#define __GTK_VBOX_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_VBOX_H__
-#define __GTK_VBOX_H__
-
 #include <gtk/gtkbox.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkvpaned.h b/gtk/deprecated/gtkvpaned.h
index bc54966a26..eb9f7d5c00 100644
--- a/gtk/deprecated/gtkvpaned.h
+++ b/gtk/deprecated/gtkvpaned.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_VPANED_H__
+#define __GTK_VPANED_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_VPANED_H__
-#define __GTK_VPANED_H__
-
 #include <gtk/gtkpaned.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkvscale.h b/gtk/deprecated/gtkvscale.h
index 8d191c0084..cff8db86ae 100644
--- a/gtk/deprecated/gtkvscale.h
+++ b/gtk/deprecated/gtkvscale.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_VSCALE_H__
+#define __GTK_VSCALE_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_VSCALE_H__
-#define __GTK_VSCALE_H__
-
 #include <gtk/gtkscale.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkvscrollbar.h b/gtk/deprecated/gtkvscrollbar.h
index 8f641a9e1a..4c485d2b86 100644
--- a/gtk/deprecated/gtkvscrollbar.h
+++ b/gtk/deprecated/gtkvscrollbar.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_VSCROLLBAR_H__
+#define __GTK_VSCROLLBAR_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_VSCROLLBAR_H__
-#define __GTK_VSCROLLBAR_H__
-
 #include <gtk/gtkscrollbar.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/deprecated/gtkvseparator.h b/gtk/deprecated/gtkvseparator.h
index f0f44515ff..d96b0286c9 100644
--- a/gtk/deprecated/gtkvseparator.h
+++ b/gtk/deprecated/gtkvseparator.h
@@ -22,13 +22,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GTK_VSEPARATOR_H__
+#define __GTK_VSEPARATOR_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_VSEPARATOR_H__
-#define __GTK_VSEPARATOR_H__
-
 #include <gtk/gtkseparator.h>
 
 G_BEGIN_DECLS