summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdk/broadway/gdkbroadwaycursor.h6
-rw-r--r--gdk/broadway/gdkbroadwaydisplaymanager.h6
-rw-r--r--gdk/gdkapplaunchcontext.h6
-rw-r--r--gdk/gdkcairo.h6
-rw-r--r--gdk/gdkcolor.h6
-rw-r--r--gdk/gdkcursor.h6
-rw-r--r--gdk/gdkdevice.h6
-rw-r--r--gdk/gdkdevicemanager.h6
-rw-r--r--gdk/gdkdisplay.h6
-rw-r--r--gdk/gdkdisplaymanager.h6
-rw-r--r--gdk/gdkdnd.h6
-rw-r--r--gdk/gdkevents.h6
-rw-r--r--gdk/gdkkeys.h6
-rw-r--r--gdk/gdkmain.h6
-rw-r--r--gdk/gdkpango.h6
-rw-r--r--gdk/gdkpixbuf.h6
-rw-r--r--gdk/gdkproperty.h6
-rw-r--r--gdk/gdkrectangle.h6
-rw-r--r--gdk/gdkrgba.h6
-rw-r--r--gdk/gdkscreen.h6
-rw-r--r--gdk/gdkselection.h6
-rw-r--r--gdk/gdktestutils.h6
-rw-r--r--gdk/gdkthreads.h6
-rw-r--r--gdk/gdktypes.h6
-rw-r--r--gdk/gdkvisual.h6
-rw-r--r--gdk/gdkwindow.h6
-rw-r--r--gdk/quartz/gdkquartzcursor.h6
-rw-r--r--gdk/quartz/gdkquartzdevice-core.h6
-rw-r--r--gdk/quartz/gdkquartzdevicemanager-core.h6
-rw-r--r--gdk/quartz/gdkquartzdisplay.h6
-rw-r--r--gdk/quartz/gdkquartzdisplaymanager.h6
-rw-r--r--gdk/quartz/gdkquartzdnd.h6
-rw-r--r--gdk/quartz/gdkquartzkeys.h6
-rw-r--r--gdk/quartz/gdkquartzscreen.h6
-rw-r--r--gdk/quartz/gdkquartzutils.h6
-rw-r--r--gdk/quartz/gdkquartzvisual.h6
-rw-r--r--gdk/quartz/gdkquartzwindow.h6
-rw-r--r--gdk/win32/gdkwin32cursor.h6
-rw-r--r--gdk/win32/gdkwin32display.h6
-rw-r--r--gdk/win32/gdkwin32displaymanager.h6
-rw-r--r--gdk/win32/gdkwin32dnd.h6
-rw-r--r--gdk/win32/gdkwin32keys.h6
-rw-r--r--gdk/win32/gdkwin32screen.h6
-rw-r--r--gdk/win32/gdkwin32window.h6
-rw-r--r--gdk/x11/gdkx11applaunchcontext.h6
-rw-r--r--gdk/x11/gdkx11cursor.h6
-rw-r--r--gdk/x11/gdkx11device.h6
-rw-r--r--gdk/x11/gdkx11devicemanager.h6
-rw-r--r--gdk/x11/gdkx11display.h6
-rw-r--r--gdk/x11/gdkx11displaymanager.h6
-rw-r--r--gdk/x11/gdkx11dnd.h6
-rw-r--r--gdk/x11/gdkx11keys.h6
-rw-r--r--gdk/x11/gdkx11property.h6
-rw-r--r--gdk/x11/gdkx11screen.h6
-rw-r--r--gdk/x11/gdkx11selection.h6
-rw-r--r--gdk/x11/gdkx11utils.h6
-rw-r--r--gdk/x11/gdkx11visual.h6
-rw-r--r--gdk/x11/gdkx11window.h6
-rw-r--r--gtk/a11y/gtkarrowaccessible.h6
-rw-r--r--gtk/a11y/gtkbooleancellaccessible.h6
-rw-r--r--gtk/a11y/gtkbuttonaccessible.h6
-rw-r--r--gtk/a11y/gtkcellaccessible.h6
-rw-r--r--gtk/a11y/gtkcellaccessibleparent.h6
-rw-r--r--gtk/a11y/gtkcheckmenuitemaccessible.h6
-rw-r--r--gtk/a11y/gtkcomboboxaccessible.h6
-rw-r--r--gtk/a11y/gtkcontaineraccessible.h6
-rw-r--r--gtk/a11y/gtkcontainercellaccessible.h6
-rw-r--r--gtk/a11y/gtkentryaccessible.h6
-rw-r--r--gtk/a11y/gtkexpanderaccessible.h6
-rw-r--r--gtk/a11y/gtkframeaccessible.h6
-rw-r--r--gtk/a11y/gtkiconviewaccessible.h6
-rw-r--r--gtk/a11y/gtkimageaccessible.h6
-rw-r--r--gtk/a11y/gtkimagecellaccessible.h6
-rw-r--r--gtk/a11y/gtklabelaccessible.h6
-rw-r--r--gtk/a11y/gtklinkbuttonaccessible.h6
-rw-r--r--gtk/a11y/gtklockbuttonaccessible.h6
-rw-r--r--gtk/a11y/gtkmenuaccessible.h6
-rw-r--r--gtk/a11y/gtkmenuitemaccessible.h6
-rw-r--r--gtk/a11y/gtkmenushellaccessible.h6
-rw-r--r--gtk/a11y/gtknotebookaccessible.h6
-rw-r--r--gtk/a11y/gtknotebookpageaccessible.h6
-rw-r--r--gtk/a11y/gtkpanedaccessible.h6
-rw-r--r--gtk/a11y/gtkprogressbaraccessible.h6
-rw-r--r--gtk/a11y/gtkradiobuttonaccessible.h6
-rw-r--r--gtk/a11y/gtkradiomenuitemaccessible.h6
-rw-r--r--gtk/a11y/gtkrangeaccessible.h6
-rw-r--r--gtk/a11y/gtkrenderercellaccessible.h6
-rw-r--r--gtk/a11y/gtkscaleaccessible.h6
-rw-r--r--gtk/a11y/gtkscalebuttonaccessible.h6
-rw-r--r--gtk/a11y/gtkscrolledwindowaccessible.h6
-rw-r--r--gtk/a11y/gtkspinbuttonaccessible.h6
-rw-r--r--gtk/a11y/gtkspinneraccessible.h6
-rw-r--r--gtk/a11y/gtkstatusbaraccessible.h6
-rw-r--r--gtk/a11y/gtkswitchaccessible.h6
-rw-r--r--gtk/a11y/gtktextcellaccessible.h6
-rw-r--r--gtk/a11y/gtktextviewaccessible.h6
-rw-r--r--gtk/a11y/gtktogglebuttonaccessible.h6
-rw-r--r--gtk/a11y/gtktoplevelaccessible.h6
-rw-r--r--gtk/a11y/gtktreeviewaccessible.h6
-rw-r--r--gtk/a11y/gtkwidgetaccessible.h6
-rw-r--r--gtk/a11y/gtkwindowaccessible.h6
-rw-r--r--gtk/deprecated/gtkcolorsel.h6
-rw-r--r--gtk/deprecated/gtkcolorseldialog.h6
-rw-r--r--gtk/deprecated/gtkfontsel.h8
-rw-r--r--gtk/deprecated/gtkgradient.h6
-rw-r--r--gtk/deprecated/gtkhandlebox.h6
-rw-r--r--gtk/deprecated/gtkhbbox.h6
-rw-r--r--gtk/deprecated/gtkhbox.h8
-rw-r--r--gtk/deprecated/gtkhpaned.h6
-rw-r--r--gtk/deprecated/gtkhscale.h6
-rw-r--r--gtk/deprecated/gtkhscrollbar.h6
-rw-r--r--gtk/deprecated/gtkhseparator.h6
-rw-r--r--gtk/deprecated/gtkhsv.h6
-rw-r--r--gtk/deprecated/gtkrc.h6
-rw-r--r--gtk/deprecated/gtkstyle.h8
-rw-r--r--gtk/deprecated/gtksymboliccolor.h6
-rw-r--r--gtk/deprecated/gtktable.h6
-rw-r--r--gtk/deprecated/gtktearoffmenuitem.h6
-rw-r--r--gtk/deprecated/gtkvbbox.h6
-rw-r--r--gtk/deprecated/gtkvbox.h6
-rw-r--r--gtk/deprecated/gtkvpaned.h6
-rw-r--r--gtk/deprecated/gtkvscale.h6
-rw-r--r--gtk/deprecated/gtkvscrollbar.h6
-rw-r--r--gtk/deprecated/gtkvseparator.h6
-rw-r--r--gtk/gtkaboutdialog.h6
-rw-r--r--gtk/gtkaccelgroup.h8
-rw-r--r--gtk/gtkaccellabel.h8
-rw-r--r--gtk/gtkaccelmap.h8
-rw-r--r--gtk/gtkaccelmapprivate.h8
-rw-r--r--gtk/gtkaccessible.h6
-rw-r--r--gtk/gtkaction.h6
-rw-r--r--gtk/gtkactiongroup.h6
-rw-r--r--gtk/gtkactivatable.h6
-rw-r--r--gtk/gtkadjustment.h6
-rw-r--r--gtk/gtkalignment.h8
-rw-r--r--gtk/gtkappchooser.h6
-rw-r--r--gtk/gtkappchooserbutton.h6
-rw-r--r--gtk/gtkappchooserdialog.h6
-rw-r--r--gtk/gtkappchooserwidget.h6
-rw-r--r--gtk/gtkapplication.h6
-rw-r--r--gtk/gtkarrow.h8
-rw-r--r--gtk/gtkaspectframe.h8
-rw-r--r--gtk/gtkassistant.h6
-rw-r--r--gtk/gtkbbox.h6
-rw-r--r--gtk/gtkbin.h8
-rw-r--r--gtk/gtkbindings.h8
-rw-r--r--gtk/gtkborder.h6
-rw-r--r--gtk/gtkbox.h8
-rw-r--r--gtk/gtkbuildable.h6
-rw-r--r--gtk/gtkbuilder.h6
-rw-r--r--gtk/gtkbutton.h8
-rw-r--r--gtk/gtkcalendar.h8
-rw-r--r--gtk/gtkcellarea.h6
-rw-r--r--gtk/gtkcellareabox.h6
-rw-r--r--gtk/gtkcellareaboxcontextprivate.h6
-rw-r--r--gtk/gtkcellareacontext.h6
-rw-r--r--gtk/gtkcelleditable.h6
-rw-r--r--gtk/gtkcelllayout.h6
-rw-r--r--gtk/gtkcellrenderer.h6
-rw-r--r--gtk/gtkcellrendereraccel.h6
-rw-r--r--gtk/gtkcellrenderercombo.h6
-rw-r--r--gtk/gtkcellrendererpixbuf.h6
-rw-r--r--gtk/gtkcellrendererprogress.h6
-rw-r--r--gtk/gtkcellrendererspin.h6
-rw-r--r--gtk/gtkcellrendererspinner.h6
-rw-r--r--gtk/gtkcellrenderertext.h8
-rw-r--r--gtk/gtkcellrenderertoggle.h6
-rw-r--r--gtk/gtkcellview.h6
-rw-r--r--gtk/gtkcheckbutton.h8
-rw-r--r--gtk/gtkcheckmenuitem.h8
-rw-r--r--gtk/gtkclipboard.h6
-rw-r--r--gtk/gtkcolorbutton.h8
-rw-r--r--gtk/gtkcolorchooser.h6
-rw-r--r--gtk/gtkcolorchooserdialog.h6
-rw-r--r--gtk/gtkcolorchooserwidget.h6
-rw-r--r--gtk/gtkcoloreditorprivate.h6
-rw-r--r--gtk/gtkcolorplaneprivate.h6
-rw-r--r--gtk/gtkcolorscaleprivate.h6
-rw-r--r--gtk/gtkcolorswatchprivate.h6
-rw-r--r--gtk/gtkcolorutils.h6
-rw-r--r--gtk/gtkcombobox.h6
-rw-r--r--gtk/gtkcomboboxtext.h6
-rw-r--r--gtk/gtkcontainer.h8
-rw-r--r--gtk/gtkdebug.h6
-rw-r--r--gtk/gtkdialog.h8
-rw-r--r--gtk/gtkdnd.h8
-rw-r--r--gtk/gtkdrawingarea.h8
-rw-r--r--gtk/gtkeditable.h8
-rw-r--r--gtk/gtkentry.h8
-rw-r--r--gtk/gtkentrybuffer.h6
-rw-r--r--gtk/gtkentrycompletion.h6
-rw-r--r--gtk/gtkenums.h6
-rw-r--r--gtk/gtkeventbox.h8
-rw-r--r--gtk/gtkexpander.h6
-rw-r--r--gtk/gtkfilechooser.h6
-rw-r--r--gtk/gtkfilechooserbutton.h6
-rw-r--r--gtk/gtkfilechooserdialog.h6
-rw-r--r--gtk/gtkfilechooserwidget.h6
-rw-r--r--gtk/gtkfilefilter.h6
-rw-r--r--gtk/gtkfixed.h8
-rw-r--r--gtk/gtkfontbutton.h6
-rw-r--r--gtk/gtkfontchooser.h6
-rw-r--r--gtk/gtkfontchooserdialog.h6
-rw-r--r--gtk/gtkfontchooserwidget.h6
-rw-r--r--gtk/gtkframe.h8
-rw-r--r--gtk/gtkgrid.h8
-rw-r--r--gtk/gtkiconfactory.h6
-rw-r--r--gtk/gtkicontheme.h6
-rw-r--r--gtk/gtkiconview.h6
-rw-r--r--gtk/gtkimage.h8
-rw-r--r--gtk/gtkimagemenuitem.h8
-rw-r--r--gtk/gtkimcontext.h8
-rw-r--r--gtk/gtkimcontextinfo.h8
-rw-r--r--gtk/gtkimcontextsimple.h6
-rw-r--r--gtk/gtkimmulticontext.h6
-rw-r--r--gtk/gtkinfobar.h6
-rw-r--r--gtk/gtkinvisible.h6
-rw-r--r--gtk/gtklabel.h8
-rw-r--r--gtk/gtklayout.h8
-rw-r--r--gtk/gtklevelbar.h6
-rw-r--r--gtk/gtklinkbutton.h6
-rw-r--r--gtk/gtkliststore.h6
-rw-r--r--gtk/gtkmain.h8
-rw-r--r--gtk/gtkmenu.h8
-rw-r--r--gtk/gtkmenubar.h8
-rw-r--r--gtk/gtkmenubutton.h6
-rw-r--r--gtk/gtkmenuitem.h6
-rw-r--r--gtk/gtkmenushell.h8
-rw-r--r--gtk/gtkmenutoolbutton.h6
-rw-r--r--gtk/gtkmessagedialog.h6
-rw-r--r--gtk/gtkmisc.h8
-rw-r--r--gtk/gtkmodules.h6
-rw-r--r--gtk/gtkmountoperation.h6
-rw-r--r--gtk/gtknotebook.h8
-rw-r--r--gtk/gtknumerableicon.h6
-rw-r--r--gtk/gtkoffscreenwindow.h6
-rw-r--r--gtk/gtkorientable.h6
-rw-r--r--gtk/gtkoverlay.h6
-rw-r--r--gtk/gtkpagesetup.h8
-rw-r--r--gtk/gtkpagesetupunixdialog.h6
-rw-r--r--gtk/gtkpaned.h6
-rw-r--r--gtk/gtkpapersize.h8
-rw-r--r--gtk/gtkplug.h6
-rw-r--r--gtk/gtkpressandholdprivate.h6
-rw-r--r--gtk/gtkprintcontext.h8
-rw-r--r--gtk/gtkprinter.h6
-rw-r--r--gtk/gtkprintjob.h6
-rw-r--r--gtk/gtkprintoperation.h8
-rw-r--r--gtk/gtkprintoperationpreview.h6
-rw-r--r--gtk/gtkprintsettings.h6
-rw-r--r--gtk/gtkprintunixdialog.h6
-rw-r--r--gtk/gtkprogressbar.h6
-rw-r--r--gtk/gtkradioaction.h6
-rw-r--r--gtk/gtkradiobutton.h8
-rw-r--r--gtk/gtkradiomenuitem.h8
-rw-r--r--gtk/gtkradiotoolbutton.h6
-rw-r--r--gtk/gtkrange.h8
-rw-r--r--gtk/gtkrecentaction.h6
-rw-r--r--gtk/gtkrecentchooser.h6
-rw-r--r--gtk/gtkrecentchooserdialog.h6
-rw-r--r--gtk/gtkrecentchoosermenu.h6
-rw-r--r--gtk/gtkrecentchooserwidget.h6
-rw-r--r--gtk/gtkrecentfilter.h6
-rw-r--r--gtk/gtkrecentmanager.h6
-rw-r--r--gtk/gtkscale.h8
-rw-r--r--gtk/gtkscalebutton.h6
-rw-r--r--gtk/gtkscrollable.h6
-rw-r--r--gtk/gtkscrollbar.h8
-rw-r--r--gtk/gtkscrolledwindow.h6
-rw-r--r--gtk/gtksearchentry.h6
-rw-r--r--gtk/gtkselection.h6
-rw-r--r--gtk/gtkseparator.h8
-rw-r--r--gtk/gtkseparatormenuitem.h8
-rw-r--r--gtk/gtkseparatortoolitem.h6
-rw-r--r--gtk/gtksettings.h6
-rw-r--r--gtk/gtkshow.h6
-rw-r--r--gtk/gtksizegroup.h6
-rw-r--r--gtk/gtksocket.h6
-rw-r--r--gtk/gtkspinbutton.h8
-rw-r--r--gtk/gtkspinner.h6
-rw-r--r--gtk/gtkstatusbar.h6
-rw-r--r--gtk/gtkstatusicon.h6
-rw-r--r--gtk/gtkstock.h8
-rw-r--r--gtk/gtkstylecontext.h6
-rw-r--r--gtk/gtkstyleproperties.h6
-rw-r--r--gtk/gtkstyleprovider.h6
-rw-r--r--gtk/gtkswitch.h6
-rw-r--r--gtk/gtktestutils.h6
-rw-r--r--gtk/gtktextattributes.h8
-rw-r--r--gtk/gtktextbuffer.h6
-rw-r--r--gtk/gtktextbufferrichtext.h6
-rw-r--r--gtk/gtktextchild.h6
-rw-r--r--gtk/gtktextiter.h6
-rw-r--r--gtk/gtktextmark.h6
-rw-r--r--gtk/gtktexttag.h8
-rw-r--r--gtk/gtktexttagtable.h6
-rw-r--r--gtk/gtktextview.h6
-rw-r--r--gtk/gtkthemingengine.h6
-rw-r--r--gtk/gtktoggleaction.h6
-rw-r--r--gtk/gtktogglebutton.h8
-rw-r--r--gtk/gtktoggletoolbutton.h6
-rw-r--r--gtk/gtktoolbar.h8
-rw-r--r--gtk/gtktoolbutton.h6
-rw-r--r--gtk/gtktoolitem.h6
-rw-r--r--gtk/gtktoolitemgroup.h6
-rw-r--r--gtk/gtktoolpalette.h6
-rw-r--r--gtk/gtktoolshell.h8
-rw-r--r--gtk/gtktooltip.h6
-rw-r--r--gtk/gtktreednd.h6
-rw-r--r--gtk/gtktreemenu.h6
-rw-r--r--gtk/gtktreemodel.h6
-rw-r--r--gtk/gtktreemodelfilter.h6
-rw-r--r--gtk/gtktreemodelsort.h6
-rw-r--r--gtk/gtktreeselection.h6
-rw-r--r--gtk/gtktreesortable.h8
-rw-r--r--gtk/gtktreestore.h6
-rw-r--r--gtk/gtktreeview.h6
-rw-r--r--gtk/gtktreeviewcolumn.h6
-rw-r--r--gtk/gtktypes.h6
-rw-r--r--gtk/gtkuimanager.h6
-rw-r--r--gtk/gtkviewport.h8
-rw-r--r--gtk/gtkvolumebutton.h6
-rw-r--r--gtk/gtkwidget.h6
-rw-r--r--gtk/gtkwidgetpath.h6
-rw-r--r--gtk/gtkwindow.h8
325 files changed, 1037 insertions, 1037 deletions
diff --git a/gdk/broadway/gdkbroadwaycursor.h b/gdk/broadway/gdkbroadwaycursor.h
index 65a437b7d0..94fd011ce4 100644
--- a/gdk/broadway/gdkbroadwaycursor.h
+++ b/gdk/broadway/gdkbroadwaycursor.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_BROADWAY_CURSOR_H__
+#define __GDK_BROADWAY_CURSOR_H__
+
#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkbroadway.h> can be included directly."
#endif
-#ifndef __GDK_BROADWAY_CURSOR_H__
-#define __GDK_BROADWAY_CURSOR_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/broadway/gdkbroadwaydisplaymanager.h b/gdk/broadway/gdkbroadwaydisplaymanager.h
index c90f535860..3c607ea544 100644
--- a/gdk/broadway/gdkbroadwaydisplaymanager.h
+++ b/gdk/broadway/gdkbroadwaydisplaymanager.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_BROADWAY_DISPLAY_MANAGER_H__
+#define __GDK_BROADWAY_DISPLAY_MANAGER_H__
+
#if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkbroadway.h> can be included directly."
#endif
-#ifndef __GDK_BROADWAY_DISPLAY_MANAGER_H__
-#define __GDK_BROADWAY_DISPLAY_MANAGER_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index 899fe01ac5..af141dca6c 100644
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -18,13 +18,13 @@
* Author: Alexander Larsson <alexl@redhat.com>
*/
+#ifndef __GDK_APP_LAUNCH_CONTEXT_H__
+#define __GDK_APP_LAUNCH_CONTEXT_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_APP_LAUNCH_CONTEXT_H__
-#define __GDK_APP_LAUNCH_CONTEXT_H__
-
#include <gio/gio.h>
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
diff --git a/gdk/gdkcairo.h b/gdk/gdkcairo.h
index 5a969d2bc3..5d72f3fac6 100644
--- a/gdk/gdkcairo.h
+++ b/gdk/gdkcairo.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_CAIRO_H__
+#define __GDK_CAIRO_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_CAIRO_H__
-#define __GDK_CAIRO_H__
-
#include <gdk/gdkversionmacros.h>
#include <gdk/gdkcolor.h>
#include <gdk/gdkrgba.h>
diff --git a/gdk/gdkcolor.h b/gdk/gdkcolor.h
index 9554c0e7e6..74310f3716 100644
--- a/gdk/gdkcolor.h
+++ b/gdk/gdkcolor.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_COLOR_H__
+#define __GDK_COLOR_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_COLOR_H__
-#define __GDK_COLOR_H__
-
#include <cairo.h>
#include <gdk/gdktypes.h>
diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index 9c5399764b..16e965b9c9 100644
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_CURSOR_H__
+#define __GDK_CURSOR_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_CURSOR_H__
-#define __GDK_CURSOR_H__
-
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index 02c26cc177..c620905a60 100644
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_DEVICE_H__
+#define __GDK_DEVICE_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_DEVICE_H__
-#define __GDK_DEVICE_H__
-
#include <gdk/gdktypes.h>
diff --git a/gdk/gdkdevicemanager.h b/gdk/gdkdevicemanager.h
index 3c21c9cab5..f0e1afe5a8 100644
--- a/gdk/gdkdevicemanager.h
+++ b/gdk/gdkdevicemanager.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_DEVICE_MANAGER_H__
+#define __GDK_DEVICE_MANAGER_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_DEVICE_MANAGER_H__
-#define __GDK_DEVICE_MANAGER_H__
-
#include <gdk/gdktypes.h>
#include <gdk/gdkdevice.h>
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 86e0735088..c0566e7c55 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -19,13 +19,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_DISPLAY_H__
+#define __GDK_DISPLAY_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_DISPLAY_H__
-#define __GDK_DISPLAY_H__
-
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
#include <gdk/gdkevents.h>
diff --git a/gdk/gdkdisplaymanager.h b/gdk/gdkdisplaymanager.h
index a248bbd667..419b3f5739 100644
--- a/gdk/gdkdisplaymanager.h
+++ b/gdk/gdkdisplaymanager.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_DISPLAY_MANAGER_H__
+#define __GDK_DISPLAY_MANAGER_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_DISPLAY_MANAGER_H__
-#define __GDK_DISPLAY_MANAGER_H__
-
#include <gdk/gdktypes.h>
#include <gdk/gdkdisplay.h>
diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h
index 3b51487a79..c9fa16a0e8 100644
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_DND_H__
+#define __GDK_DND_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_DND_H__
-#define __GDK_DND_H__
-
#include <gdk/gdktypes.h>
#include <gdk/gdkdevice.h>
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index 9b1a869c8f..694505567d 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_EVENTS_H__
+#define __GDK_EVENTS_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_EVENTS_H__
-#define __GDK_EVENTS_H__
-
#include <gdk/gdkversionmacros.h>
#include <gdk/gdkcolor.h>
#include <gdk/gdktypes.h>
diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h
index 28d46d2970..f402270ad9 100644
--- a/gdk/gdkkeys.h
+++ b/gdk/gdkkeys.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_KEYS_H__
+#define __GDK_KEYS_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_KEYS_H__
-#define __GDK_KEYS_H__
-
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
diff --git a/gdk/gdkmain.h b/gdk/gdkmain.h
index d251c427f1..27788dd2da 100644
--- a/gdk/gdkmain.h
+++ b/gdk/gdkmain.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_MAIN_H__
+#define __GDK_MAIN_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_MAIN_H__
-#define __GDK_MAIN_H__
-
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h
index c05d13593a..28402cd0d0 100644
--- a/gdk/gdkpango.h
+++ b/gdk/gdkpango.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_PANGO_H__
+#define __GDK_PANGO_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_PANGO_H__
-#define __GDK_PANGO_H__
-
#include <gdk/gdktypes.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h
index b8b8bda472..96e2d7f7dd 100644
--- a/gdk/gdkpixbuf.h
+++ b/gdk/gdkpixbuf.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_PIXBUF_H__
+#define __GDK_PIXBUF_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_PIXBUF_H__
-#define __GDK_PIXBUF_H__
-
#include <cairo.h>
#include <gdk/gdktypes.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/gdk/gdkproperty.h b/gdk/gdkproperty.h
index eca0ae0c46..795f1d4971 100644
--- a/gdk/gdkproperty.h
+++ b/gdk/gdkproperty.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_PROPERTY_H__
+#define __GDK_PROPERTY_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_PROPERTY_H__
-#define __GDK_PROPERTY_H__
-
#include <gdk/gdktypes.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkrectangle.h b/gdk/gdkrectangle.h
index f3ad7a0903..2a17299b5d 100644
--- a/gdk/gdkrectangle.h
+++ b/gdk/gdkrectangle.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_RECTANGLE_H__
+#define __GDK_RECTANGLE_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_RECTANGLE_H__
-#define __GDK_RECTANGLE_H__
-
#include <gdk/gdktypes.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkrgba.h b/gdk/gdkrgba.h
index 3e6aed5866..9f0f0743b2 100644
--- a/gdk/gdkrgba.h
+++ b/gdk/gdkrgba.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_RGBA_H__
+#define __GDK_RGBA_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_RGBA_H__
-#define __GDK_RGBA_H__
-
#include <gdk/gdktypes.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index b26f261821..e3a66c654d 100644
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -19,13 +19,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_SCREEN_H__
+#define __GDK_SCREEN_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_SCREEN_H__
-#define __GDK_SCREEN_H__
-
#include <cairo.h>
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
diff --git a/gdk/gdkselection.h b/gdk/gdkselection.h
index f8a5195dbb..ae964e78f5 100644
--- a/gdk/gdkselection.h
+++ b/gdk/gdkselection.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_SELECTION_H__
+#define __GDK_SELECTION_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_SELECTION_H__
-#define __GDK_SELECTION_H__
-
#include <gdk/gdktypes.h>
G_BEGIN_DECLS
diff --git a/gdk/gdktestutils.h b/gdk/gdktestutils.h
index 4471e887ee..dcbb6ea2de 100644
--- a/gdk/gdktestutils.h
+++ b/gdk/gdktestutils.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_TEST_UTILS_H__
+#define __GDK_TEST_UTILS_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_TEST_UTILS_H__
-#define __GDK_TEST_UTILS_H__
-
#include <gdk/gdkwindow.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkthreads.h b/gdk/gdkthreads.h
index 49f15afa55..8869cfc014 100644
--- a/gdk/gdkthreads.h
+++ b/gdk/gdkthreads.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_THREADS_H__
+#define __GDK_THREADS_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_THREADS_H__
-#define __GDK_THREADS_H__
-
#include <gdk/gdktypes.h>
G_BEGIN_DECLS
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 2b25473da9..97e4540a67 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_TYPES_H__
+#define __GDK_TYPES_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_TYPES_H__
-#define __GDK_TYPES_H__
-
/* GDK uses "glib". (And so does GTK).
*/
#include <glib.h>
diff --git a/gdk/gdkvisual.h b/gdk/gdkvisual.h
index 207e09a60d..c15808e8e9 100644
--- a/gdk/gdkvisual.h
+++ b/gdk/gdkvisual.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_VISUAL_H__
+#define __GDK_VISUAL_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_VISUAL_H__
-#define __GDK_VISUAL_H__
-
#include <gdk/gdktypes.h>
G_BEGIN_DECLS
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 10239132ba..4a5daf8482 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_WINDOW_H__
+#define __GDK_WINDOW_H__
+
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdk.h> can be included directly."
#endif
-#ifndef __GDK_WINDOW_H__
-#define __GDK_WINDOW_H__
-
#include <gdk/gdkversionmacros.h>
#include <gdk/gdktypes.h>
#include <gdk/gdkevents.h>
diff --git a/gdk/quartz/gdkquartzcursor.h b/gdk/quartz/gdkquartzcursor.h
index 37b444eff7..14ee12dbef 100644
--- a/gdk/quartz/gdkquartzcursor.h
+++ b/gdk/quartz/gdkquartzcursor.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_CURSOR_H__
+#define __GDK_QUARTZ_CURSOR_H__
+
#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_CURSOR_H__
-#define __GDK_QUARTZ_CURSOR_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzdevice-core.h b/gdk/quartz/gdkquartzdevice-core.h
index 753e1305b7..f239016426 100644
--- a/gdk/quartz/gdkquartzdevice-core.h
+++ b/gdk/quartz/gdkquartzdevice-core.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_DEVICE_CORE_H__
+#define __GDK_QUARTZ_DEVICE_CORE_H__
+
#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_DEVICE_CORE_H__
-#define __GDK_QUARTZ_DEVICE_CORE_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzdevicemanager-core.h b/gdk/quartz/gdkquartzdevicemanager-core.h
index 29f008cfb6..d8aa156e6f 100644
--- a/gdk/quartz/gdkquartzdevicemanager-core.h
+++ b/gdk/quartz/gdkquartzdevicemanager-core.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_DEVICE_MANAGER_CORE_H__
+#define __GDK_QUARTZ_DEVICE_MANAGER_CORE_H__
+
#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_DEVICE_MANAGER_CORE_H__
-#define __GDK_QUARTZ_DEVICE_MANAGER_CORE_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzdisplay.h b/gdk/quartz/gdkquartzdisplay.h
index e99128c5e9..786a511556 100644
--- a/gdk/quartz/gdkquartzdisplay.h
+++ b/gdk/quartz/gdkquartzdisplay.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_DISPLAY_H__
+#define __GDK_QUARTZ_DISPLAY_H__
+
#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_DISPLAY_H__
-#define __GDK_QUARTZ_DISPLAY_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzdisplaymanager.h b/gdk/quartz/gdkquartzdisplaymanager.h
index 4b7d80188a..11662158cc 100644
--- a/gdk/quartz/gdkquartzdisplaymanager.h
+++ b/gdk/quartz/gdkquartzdisplaymanager.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_DISPLAY_MANAGER_H__
+#define __GDK_QUARTZ_DISPLAY_MANAGER_H__
+
#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_DISPLAY_MANAGER_H__
-#define __GDK_QUARTZ_DISPLAY_MANAGER_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzdnd.h b/gdk/quartz/gdkquartzdnd.h
index bc4a1226bd..201b474b28 100644
--- a/gdk/quartz/gdkquartzdnd.h
+++ b/gdk/quartz/gdkquartzdnd.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_DND_H__
+#define __GDK_QUARTZ_DND_H__
+
#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_DND_H__
-#define __GDK_QUARTZ_DND_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzkeys.h b/gdk/quartz/gdkquartzkeys.h
index 63bfe6de6a..fc4f4b0053 100644
--- a/gdk/quartz/gdkquartzkeys.h
+++ b/gdk/quartz/gdkquartzkeys.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_KEYS_H__
+#define __GDK_QUARTZ_KEYS_H__
+
#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_KEYS_H__
-#define __GDK_QUARTZ_KEYS_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzscreen.h b/gdk/quartz/gdkquartzscreen.h
index 733d5d271f..5642d9579f 100644
--- a/gdk/quartz/gdkquartzscreen.h
+++ b/gdk/quartz/gdkquartzscreen.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_SCREEN_H__
+#define __GDK_QUARTZ_SCREEN_H__
+
#if !defined(__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_SCREEN_H__
-#define __GDK_QUARTZ_SCREEN_H__
-
G_BEGIN_DECLS
#include <gdk/gdk.h>
diff --git a/gdk/quartz/gdkquartzutils.h b/gdk/quartz/gdkquartzutils.h
index 27aaae5d95..127ce177bd 100644
--- a/gdk/quartz/gdkquartzutils.h
+++ b/gdk/quartz/gdkquartzutils.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_UTILS_H__
+#define __GDK_QUARTZ_UTILS_H__
+
#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_UTILS_H__
-#define __GDK_QUARTZ_UTILS_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzvisual.h b/gdk/quartz/gdkquartzvisual.h
index 98bd87f330..3199322f5c 100644
--- a/gdk/quartz/gdkquartzvisual.h
+++ b/gdk/quartz/gdkquartzvisual.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_VISUAL_H__
+#define __GDK_QUARTZ_VISUAL_H__
+
#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_VISUAL_H__
-#define __GDK_QUARTZ_VISUAL_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/quartz/gdkquartzwindow.h b/gdk/quartz/gdkquartzwindow.h
index 3f1fbd6c8a..d33087cb18 100644
--- a/gdk/quartz/gdkquartzwindow.h
+++ b/gdk/quartz/gdkquartzwindow.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_QUARTZ_WINDOW_H__
+#define __GDK_QUARTZ_WINDOW_H__
+
#if !defined (__GDKQUARTZ_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkquartz.h> can be included directly."
#endif
-#ifndef __GDK_QUARTZ_WINDOW_H__
-#define __GDK_QUARTZ_WINDOW_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/win32/gdkwin32cursor.h b/gdk/win32/gdkwin32cursor.h
index 361cb92dcb..99b479f091 100644
--- a/gdk/win32/gdkwin32cursor.h
+++ b/gdk/win32/gdkwin32cursor.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_WIN32_CURSOR_H__
+#define __GDK_WIN32_CURSOR_H__
+
#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkwin32.h> can be included directly."
#endif
-#ifndef __GDK_WIN32_CURSOR_H__
-#define __GDK_WIN32_CURSOR_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/win32/gdkwin32display.h b/gdk/win32/gdkwin32display.h
index eb1bfeb6f6..ca257f2d83 100644
--- a/gdk/win32/gdkwin32display.h
+++ b/gdk/win32/gdkwin32display.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_WIN32_DISPLAY_H__
+#define __GDK_WIN32_DISPLAY_H__
+
#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkwin32.h> can be included directly."
#endif
-#ifndef __GDK_WIN32_DISPLAY_H__
-#define __GDK_WIN32_DISPLAY_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/win32/gdkwin32displaymanager.h b/gdk/win32/gdkwin32displaymanager.h
index 9217f435c9..e5d96b5565 100644
--- a/gdk/win32/gdkwin32displaymanager.h
+++ b/gdk/win32/gdkwin32displaymanager.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_WIN32_DISPLAY_MANAGER_H__
+#define __GDK_WIN32_DISPLAY_MANAGER_H__
+
#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkwin32.h> can be included directly."
#endif
-#ifndef __GDK_WIN32_DISPLAY_MANAGER_H__
-#define __GDK_WIN32_DISPLAY_MANAGER_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/win32/gdkwin32dnd.h b/gdk/win32/gdkwin32dnd.h
index 06ad679848..457d3ccfbb 100644
--- a/gdk/win32/gdkwin32dnd.h
+++ b/gdk/win32/gdkwin32dnd.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_WIN32_DND_H__
+#define __GDK_WIN32_DND_H__
+
#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkwin32.h> can be included directly."
#endif
-#ifndef __GDK_WIN32_DND_H__
-#define __GDK_WIN32_DND_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/win32/gdkwin32keys.h b/gdk/win32/gdkwin32keys.h
index af90763a07..c271d67861 100644
--- a/gdk/win32/gdkwin32keys.h
+++ b/gdk/win32/gdkwin32keys.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_WIN32_KEYS_H__
+#define __GDK_WIN32_KEYS_H__
+
#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkwin32.h> can be included directly."
#endif
-#ifndef __GDK_WIN32_KEYS_H__
-#define __GDK_WIN32_KEYS_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/win32/gdkwin32screen.h b/gdk/win32/gdkwin32screen.h
index a239166f3d..e64001b271 100644
--- a/gdk/win32/gdkwin32screen.h
+++ b/gdk/win32/gdkwin32screen.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_WIN32_SCREEN_H__
+#define __GDK_WIN32_SCREEN_H__
+
#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkwin32.h> can be included directly."
#endif
-#ifndef __GDK_WIN32_SCREEN_H__
-#define __GDK_WIN32_SCREEN_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/win32/gdkwin32window.h b/gdk/win32/gdkwin32window.h
index 3bb29fc26d..ef5e11f888 100644
--- a/gdk/win32/gdkwin32window.h
+++ b/gdk/win32/gdkwin32window.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_WIN32_WINDOW_H__
+#define __GDK_WIN32_WINDOW_H__
+
#if !defined (__GDKWIN32_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkwin32.h> can be included directly."
#endif
-#ifndef __GDK_WIN32_WINDOW_H__
-#define __GDK_WIN32_WINDOW_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/x11/gdkx11applaunchcontext.h b/gdk/x11/gdkx11applaunchcontext.h
index b1cc129ce9..7e444e813c 100644
--- a/gdk/x11/gdkx11applaunchcontext.h
+++ b/gdk/x11/gdkx11applaunchcontext.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_X11_APP_LAUNCH_CONTEXT_H__
+#define __GDK_X11_APP_LAUNCH_CONTEXT_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_APP_LAUNCH_CONTEXT_H__
-#define __GDK_X11_APP_LAUNCH_CONTEXT_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/x11/gdkx11cursor.h b/gdk/x11/gdkx11cursor.h
index aa44ceab6a..0c0f9b2a4a 100644
--- a/gdk/x11/gdkx11cursor.h
+++ b/gdk/x11/gdkx11cursor.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_CURSOR_H__
+#define __GDK_X11_CURSOR_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_CURSOR_H__
-#define __GDK_X11_CURSOR_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11device.h b/gdk/x11/gdkx11device.h
index 2380c2038d..f42613bfbe 100644
--- a/gdk/x11/gdkx11device.h
+++ b/gdk/x11/gdkx11device.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_X11_DEVICE_H__
+#define __GDK_X11_DEVICE_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_DEVICE_H__
-#define __GDK_X11_DEVICE_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/x11/gdkx11devicemanager.h b/gdk/x11/gdkx11devicemanager.h
index 542e42e2a7..14918613b5 100644
--- a/gdk/x11/gdkx11devicemanager.h
+++ b/gdk/x11/gdkx11devicemanager.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_X11_DEVICE_MANAGER_H__
+#define __GDK_X11_DEVICE_MANAGER_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_DEVICE_MANAGER_H__
-#define __GDK_X11_DEVICE_MANAGER_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h
index ade98f2e7b..323463b324 100644
--- a/gdk/x11/gdkx11display.h
+++ b/gdk/x11/gdkx11display.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_DISPLAY_H__
+#define __GDK_X11_DISPLAY_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_DISPLAY_H__
-#define __GDK_X11_DISPLAY_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11displaymanager.h b/gdk/x11/gdkx11displaymanager.h
index 0852c72774..3ffb944238 100644
--- a/gdk/x11/gdkx11displaymanager.h
+++ b/gdk/x11/gdkx11displaymanager.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_X11_DISPLAY_MANAGER_H__
+#define __GDK_X11_DISPLAY_MANAGER_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_DISPLAY_MANAGER_H__
-#define __GDK_X11_DISPLAY_MANAGER_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/x11/gdkx11dnd.h b/gdk/x11/gdkx11dnd.h
index f1bc7888bb..856d2f1090 100644
--- a/gdk/x11/gdkx11dnd.h
+++ b/gdk/x11/gdkx11dnd.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_X11_DND_H__
+#define __GDK_X11_DND_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_DND_H__
-#define __GDK_X11_DND_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/x11/gdkx11keys.h b/gdk/x11/gdkx11keys.h
index a417e33cf2..088cd0f95b 100644
--- a/gdk/x11/gdkx11keys.h
+++ b/gdk/x11/gdkx11keys.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GDK_X11_KEYS_H__
+#define __GDK_X11_KEYS_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_KEYS_H__
-#define __GDK_X11_KEYS_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h
index 53247b8959..f1fd9346df 100644
--- a/gdk/x11/gdkx11property.h
+++ b/gdk/x11/gdkx11property.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_PROPERTY_H__
+#define __GDK_X11_PROPERTY_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_PROPERTY_H__
-#define __GDK_X11_PROPERTY_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11screen.h b/gdk/x11/gdkx11screen.h
index a612692763..1c974ef286 100644
--- a/gdk/x11/gdkx11screen.h
+++ b/gdk/x11/gdkx11screen.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_SCREEN_H__
+#define __GDK_X11_SCREEN_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_SCREEN_H__
-#define __GDK_X11_SCREEN_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11selection.h b/gdk/x11/gdkx11selection.h
index 119dcf5a72..e13b78d574 100644
--- a/gdk/x11/gdkx11selection.h
+++ b/gdk/x11/gdkx11selection.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_SELECTION_H__
+#define __GDK_X11_SELECTION_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_SELECTION_H__
-#define __GDK_X11_SELECTION_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11utils.h b/gdk/x11/gdkx11utils.h
index fd943fda2c..4f62336391 100644
--- a/gdk/x11/gdkx11utils.h
+++ b/gdk/x11/gdkx11utils.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_UTILS_H__
+#define __GDK_X11_UTILS_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_UTILS_H__
-#define __GDK_X11_UTILS_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11visual.h b/gdk/x11/gdkx11visual.h
index 026bc92422..7c39ec2d8c 100644
--- a/gdk/x11/gdkx11visual.h
+++ b/gdk/x11/gdkx11visual.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_VISUAL_H__
+#define __GDK_X11_VISUAL_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_VISUAL_H__
-#define __GDK_X11_VISUAL_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gdk/x11/gdkx11window.h b/gdk/x11/gdkx11window.h
index 43ea98435c..47bd5c5e6c 100644
--- a/gdk/x11/gdkx11window.h
+++ b/gdk/x11/gdkx11window.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GDK_X11_WINDOW_H__
+#define __GDK_X11_WINDOW_H__
+
#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
-#ifndef __GDK_X11_WINDOW_H__
-#define __GDK_X11_WINDOW_H__
-
#include <gdk/gdk.h>
#include <X11/Xlib.h>
diff --git a/gtk/a11y/gtkarrowaccessible.h b/gtk/a11y/gtkarrowaccessible.h
index 42355e1d00..6a93cedfda 100644
--- a/gtk/a11y/gtkarrowaccessible.h
+++ b/gtk/a11y/gtkarrowaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_ARROW_ACCESSIBLE_H__
+#define __GTK_ARROW_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_ARROW_ACCESSIBLE_H__
-#define __GTK_ARROW_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkbooleancellaccessible.h b/gtk/a11y/gtkbooleancellaccessible.h
index 79cfb60177..12c35ec39e 100644
--- a/gtk/a11y/gtkbooleancellaccessible.h
+++ b/gtk/a11y/gtkbooleancellaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_BOOLEAN_CELL_ACCESSIBLE_H__
+#define __GTK_BOOLEAN_CELL_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_BOOLEAN_CELL_ACCESSIBLE_H__
-#define __GTK_BOOLEAN_CELL_ACCESSIBLE_H__
-
#include <atk/atk.h>
#include <gtk/a11y/gtkrenderercellaccessible.h>
diff --git a/gtk/a11y/gtkbuttonaccessible.h b/gtk/a11y/gtkbuttonaccessible.h
index f06a754ae9..40d0a1b1cf 100644
--- a/gtk/a11y/gtkbuttonaccessible.h
+++ b/gtk/a11y/gtkbuttonaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_BUTTON_ACCESSIBLE_H__
+#define __GTK_BUTTON_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_BUTTON_ACCESSIBLE_H__
-#define __GTK_BUTTON_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkcellaccessible.h b/gtk/a11y/gtkcellaccessible.h
index 7a2d88ec03..6a869baff3 100644
--- a/gtk/a11y/gtkcellaccessible.h
+++ b/gtk/a11y/gtkcellaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_ACCESSIBLE_H__
+#define __GTK_CELL_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_CELL_ACCESSIBLE_H__
-#define __GTK_CELL_ACCESSIBLE_H__
-
#include <atk/atk.h>
#include <gtk/gtk.h>
diff --git a/gtk/a11y/gtkcellaccessibleparent.h b/gtk/a11y/gtkcellaccessibleparent.h
index bef4f3680f..1fb0a2f5b6 100644
--- a/gtk/a11y/gtkcellaccessibleparent.h
+++ b/gtk/a11y/gtkcellaccessibleparent.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_ACCESSIBLE_PARENT_H__
+#define __GTK_CELL_ACCESSIBLE_PARENT_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_CELL_ACCESSIBLE_PARENT_H__
-#define __GTK_CELL_ACCESSIBLE_PARENT_H__
-
#include <atk/atk.h>
#include <gtk/a11y/gtkcellaccessible.h>
diff --git a/gtk/a11y/gtkcheckmenuitemaccessible.h b/gtk/a11y/gtkcheckmenuitemaccessible.h
index d73432d360..e96cc737fe 100644
--- a/gtk/a11y/gtkcheckmenuitemaccessible.h
+++ b/gtk/a11y/gtkcheckmenuitemaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CHECK_MENU_ITEM_ACCESSIBLE_H__
+#define __GTK_CHECK_MENU_ITEM_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_CHECK_MENU_ITEM_ACCESSIBLE_H__
-#define __GTK_CHECK_MENU_ITEM_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkmenuitemaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkcomboboxaccessible.h b/gtk/a11y/gtkcomboboxaccessible.h
index d0c082d7be..f933c2b07b 100644
--- a/gtk/a11y/gtkcomboboxaccessible.h
+++ b/gtk/a11y/gtkcomboboxaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_COMBO_BOX_ACCESSIBLE_H__
+#define __GTK_COMBO_BOX_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_COMBO_BOX_ACCESSIBLE_H__
-#define __GTK_COMBO_BOX_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkcontaineraccessible.h b/gtk/a11y/gtkcontaineraccessible.h
index 1811df6fec..1761d21dc3 100644
--- a/gtk/a11y/gtkcontaineraccessible.h
+++ b/gtk/a11y/gtkcontaineraccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CONTAINER_ACCESSIBLE_H__
+#define __GTK_CONTAINER_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_CONTAINER_ACCESSIBLE_H__
-#define __GTK_CONTAINER_ACCESSIBLE_H__
-
#include <gtk/gtk.h>
#include <gtk/a11y/gtkwidgetaccessible.h>
diff --git a/gtk/a11y/gtkcontainercellaccessible.h b/gtk/a11y/gtkcontainercellaccessible.h
index 234e87d5d0..bc6a4baecb 100644
--- a/gtk/a11y/gtkcontainercellaccessible.h
+++ b/gtk/a11y/gtkcontainercellaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CONTAINER_CELL_ACCESSIBLE_H__
+#define __GTK_CONTAINER_CELL_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_CONTAINER_CELL_ACCESSIBLE_H__
-#define __GTK_CONTAINER_CELL_ACCESSIBLE_H__
-
#include <atk/atk.h>
#include <gtk/a11y/gtkcellaccessible.h>
diff --git a/gtk/a11y/gtkentryaccessible.h b/gtk/a11y/gtkentryaccessible.h
index 0492287e1e..1624fdf409 100644
--- a/gtk/a11y/gtkentryaccessible.h
+++ b/gtk/a11y/gtkentryaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_ENTRY_ACCESSIBLE_H__
+#define __GTK_ENTRY_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_ENTRY_ACCESSIBLE_H__
-#define __GTK_ENTRY_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkexpanderaccessible.h b/gtk/a11y/gtkexpanderaccessible.h
index 82d635fc9a..8dfc64433c 100644
--- a/gtk/a11y/gtkexpanderaccessible.h
+++ b/gtk/a11y/gtkexpanderaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_EXPANDER_ACCESSIBLE_H__
+#define __GTK_EXPANDER_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_EXPANDER_ACCESSIBLE_H__
-#define __GTK_EXPANDER_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkframeaccessible.h b/gtk/a11y/gtkframeaccessible.h
index 9d794b42db..7541003bf4 100644
--- a/gtk/a11y/gtkframeaccessible.h
+++ b/gtk/a11y/gtkframeaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_FRAME_ACCESSIBLE_H__
+#define __GTK_FRAME_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_FRAME_ACCESSIBLE_H__
-#define __GTK_FRAME_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkiconviewaccessible.h b/gtk/a11y/gtkiconviewaccessible.h
index 76977b5d3d..be4af41fb9 100644
--- a/gtk/a11y/gtkiconviewaccessible.h
+++ b/gtk/a11y/gtkiconviewaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_ICON_VIEW_ACCESSIBLE_H__
+#define __GTK_ICON_VIEW_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_ICON_VIEW_ACCESSIBLE_H__
-#define __GTK_ICON_VIEW_ACCESSIBLE_H__
-
#include <gtk/gtk.h>
#include <gtk/a11y/gtkcontaineraccessible.h>
diff --git a/gtk/a11y/gtkimageaccessible.h b/gtk/a11y/gtkimageaccessible.h
index f6d70dda23..1bfa979e21 100644
--- a/gtk/a11y/gtkimageaccessible.h
+++ b/gtk/a11y/gtkimageaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_IMAGE_ACCESSIBLE_H__
+#define __GTK_IMAGE_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_IMAGE_ACCESSIBLE_H__
-#define __GTK_IMAGE_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkimagecellaccessible.h b/gtk/a11y/gtkimagecellaccessible.h
index c288d89c66..afbb2277ec 100644
--- a/gtk/a11y/gtkimagecellaccessible.h
+++ b/gtk/a11y/gtkimagecellaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_IMAGE_CELL_ACCESSIBLE_H__
+#define __GTK_IMAGE_CELL_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_IMAGE_CELL_ACCESSIBLE_H__
-#define __GTK_IMAGE_CELL_ACCESSIBLE_H__
-
#include <atk/atk.h>
#include <gtk/a11y/gtkrenderercellaccessible.h>
diff --git a/gtk/a11y/gtklabelaccessible.h b/gtk/a11y/gtklabelaccessible.h
index 48bdf8c2b2..d96cd576c2 100644
--- a/gtk/a11y/gtklabelaccessible.h
+++ b/gtk/a11y/gtklabelaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_LABEL_ACCESSIBLE_H__
+#define __GTK_LABEL_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_LABEL_ACCESSIBLE_H__
-#define __GTK_LABEL_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtklinkbuttonaccessible.h b/gtk/a11y/gtklinkbuttonaccessible.h
index b4844139f7..78d0417d2d 100644
--- a/gtk/a11y/gtklinkbuttonaccessible.h
+++ b/gtk/a11y/gtklinkbuttonaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_LINK_BUTTON_ACCESSIBLE_H__
+#define __GTK_LINK_BUTTON_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_LINK_BUTTON_ACCESSIBLE_H__
-#define __GTK_LINK_BUTTON_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkbuttonaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtklockbuttonaccessible.h b/gtk/a11y/gtklockbuttonaccessible.h
index 6a9bc2fb5b..326d077c28 100644
--- a/gtk/a11y/gtklockbuttonaccessible.h
+++ b/gtk/a11y/gtklockbuttonaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_LOCK_BUTTON_ACCESSIBLE_H__
+#define __GTK_LOCK_BUTTON_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_LOCK_BUTTON_ACCESSIBLE_H__
-#define __GTK_LOCK_BUTTON_ACCESSIBLE_H__
-
#include <gtk/gtk.h>
#include <gtk/a11y/gtkbuttonaccessible.h>
diff --git a/gtk/a11y/gtkmenuaccessible.h b/gtk/a11y/gtkmenuaccessible.h
index 95b21e85b9..c6be76b6ee 100644
--- a/gtk/a11y/gtkmenuaccessible.h
+++ b/gtk/a11y/gtkmenuaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_MENU_ACCESSIBLE_H__
+#define __GTK_MENU_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_MENU_ACCESSIBLE_H__
-#define __GTK_MENU_ACCESSIBLE_H__
-
#include <gtk/gtk.h>
#include <gtk/a11y/gtkmenushellaccessible.h>
diff --git a/gtk/a11y/gtkmenuitemaccessible.h b/gtk/a11y/gtkmenuitemaccessible.h
index 98530e7c2a..60bf2e2ec1 100644
--- a/gtk/a11y/gtkmenuitemaccessible.h
+++ b/gtk/a11y/gtkmenuitemaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_MENU_ITEM_ACCESSIBLE_H__
+#define __GTK_MENU_ITEM_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_MENU_ITEM_ACCESSIBLE_H__
-#define __GTK_MENU_ITEM_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkmenushellaccessible.h b/gtk/a11y/gtkmenushellaccessible.h
index 156a8200a0..e51e86b085 100644
--- a/gtk/a11y/gtkmenushellaccessible.h
+++ b/gtk/a11y/gtkmenushellaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_MENU_SHELL_ACCESSIBLE_H__
+#define __GTK_MENU_SHELL_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_MENU_SHELL_ACCESSIBLE_H__
-#define __GTK_MENU_SHELL_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtknotebookaccessible.h b/gtk/a11y/gtknotebookaccessible.h
index 6ffc381d6a..da5a801b4b 100644
--- a/gtk/a11y/gtknotebookaccessible.h
+++ b/gtk/a11y/gtknotebookaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_NOTEBOOK_ACCESSIBLE_H__
+#define __GTK_NOTEBOOK_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_NOTEBOOK_ACCESSIBLE_H__
-#define __GTK_NOTEBOOK_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtknotebookpageaccessible.h b/gtk/a11y/gtknotebookpageaccessible.h
index 86bd005c9e..9fbaf38e37 100644
--- a/gtk/a11y/gtknotebookpageaccessible.h
+++ b/gtk/a11y/gtknotebookpageaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_NOTEBOOK_PAGE_ACCESSIBLE_H__
+#define __GTK_NOTEBOOK_PAGE_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_NOTEBOOK_PAGE_ACCESSIBLE_H__
-#define __GTK_NOTEBOOK_PAGE_ACCESSIBLE_H__
-
#include <gtk/a11y/gtknotebookaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkpanedaccessible.h b/gtk/a11y/gtkpanedaccessible.h
index 7ed4a0130d..fc45b1ee95 100644
--- a/gtk/a11y/gtkpanedaccessible.h
+++ b/gtk/a11y/gtkpanedaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_PANED_ACCESSIBLE_H__
+#define __GTK_PANED_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_PANED_ACCESSIBLE_H__
-#define __GTK_PANED_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkprogressbaraccessible.h b/gtk/a11y/gtkprogressbaraccessible.h
index 39a1521961..2829089cef 100644
--- a/gtk/a11y/gtkprogressbaraccessible.h
+++ b/gtk/a11y/gtkprogressbaraccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_PROGRESS_BAR_ACCESSIBLE_H__
+#define __GTK_PROGRESS_BAR_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_PROGRESS_BAR_ACCESSIBLE_H__
-#define __GTK_PROGRESS_BAR_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkradiobuttonaccessible.h b/gtk/a11y/gtkradiobuttonaccessible.h
index d3ce8dcf76..5c98b58fbd 100644
--- a/gtk/a11y/gtkradiobuttonaccessible.h
+++ b/gtk/a11y/gtkradiobuttonaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_RADIO_BUTTON_ACCESSIBLE_H__
+#define __GTK_RADIO_BUTTON_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_RADIO_BUTTON_ACCESSIBLE_H__
-#define __GTK_RADIO_BUTTON_ACCESSIBLE_H__
-
#include <gtk/a11y/gtktogglebuttonaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkradiomenuitemaccessible.h b/gtk/a11y/gtkradiomenuitemaccessible.h
index 2c9f89acee..fc96155e57 100644
--- a/gtk/a11y/gtkradiomenuitemaccessible.h
+++ b/gtk/a11y/gtkradiomenuitemaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__
+#define __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__
-#define __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkcheckmenuitemaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkrangeaccessible.h b/gtk/a11y/gtkrangeaccessible.h
index 7fbba15166..3a68d96677 100644
--- a/gtk/a11y/gtkrangeaccessible.h
+++ b/gtk/a11y/gtkrangeaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_RANGE_ACCESSIBLE_H__
+#define __GTK_RANGE_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_RANGE_ACCESSIBLE_H__
-#define __GTK_RANGE_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkrenderercellaccessible.h b/gtk/a11y/gtkrenderercellaccessible.h
index a171918f7d..c5536e4d97 100644
--- a/gtk/a11y/gtkrenderercellaccessible.h
+++ b/gtk/a11y/gtkrenderercellaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_RENDERER_CELL_ACCESSIBLE_H__
+#define __GTK_RENDERER_CELL_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_RENDERER_CELL_ACCESSIBLE_H__
-#define __GTK_RENDERER_CELL_ACCESSIBLE_H__
-
#include <atk/atk.h>
#include <gtk/a11y/gtkcellaccessible.h>
diff --git a/gtk/a11y/gtkscaleaccessible.h b/gtk/a11y/gtkscaleaccessible.h
index 4cb249a357..43806ce9a2 100644
--- a/gtk/a11y/gtkscaleaccessible.h
+++ b/gtk/a11y/gtkscaleaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_SCALE_ACCESSIBLE_H__
+#define __GTK_SCALE_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_SCALE_ACCESSIBLE_H__
-#define __GTK_SCALE_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkrangeaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkscalebuttonaccessible.h b/gtk/a11y/gtkscalebuttonaccessible.h
index e0acf186b1..08669f60fe 100644
--- a/gtk/a11y/gtkscalebuttonaccessible.h
+++ b/gtk/a11y/gtkscalebuttonaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_SCALE_BUTTON_ACCESSIBLE_H__
+#define __GTK_SCALE_BUTTON_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_SCALE_BUTTON_ACCESSIBLE_H__
-#define __GTK_SCALE_BUTTON_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkbuttonaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkscrolledwindowaccessible.h b/gtk/a11y/gtkscrolledwindowaccessible.h
index b847f8fdfe..fe04f966a8 100644
--- a/gtk/a11y/gtkscrolledwindowaccessible.h
+++ b/gtk/a11y/gtkscrolledwindowaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_SCROLLED_WINDOW_ACCESSIBLE_H__
+#define __GTK_SCROLLED_WINDOW_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_SCROLLED_WINDOW_ACCESSIBLE_H__
-#define __GTK_SCROLLED_WINDOW_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkspinbuttonaccessible.h b/gtk/a11y/gtkspinbuttonaccessible.h
index 2b3d5dd499..9fe1d66fd0 100644
--- a/gtk/a11y/gtkspinbuttonaccessible.h
+++ b/gtk/a11y/gtkspinbuttonaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_SPIN_BUTTON_ACCESSIBLE_H__
+#define __GTK_SPIN_BUTTON_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_SPIN_BUTTON_ACCESSIBLE_H__
-#define __GTK_SPIN_BUTTON_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkentryaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkspinneraccessible.h b/gtk/a11y/gtkspinneraccessible.h
index d0b2570191..bc8bd5bcd3 100644
--- a/gtk/a11y/gtkspinneraccessible.h
+++ b/gtk/a11y/gtkspinneraccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_SPINNER_ACCESSIBLE_H__
+#define __GTK_SPINNER_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_SPINNER_ACCESSIBLE_H__
-#define __GTK_SPINNER_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkstatusbaraccessible.h b/gtk/a11y/gtkstatusbaraccessible.h
index 8110b5755a..9d5bfad82e 100644
--- a/gtk/a11y/gtkstatusbaraccessible.h
+++ b/gtk/a11y/gtkstatusbaraccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_STATUSBAR_ACCESSIBLE_H__
+#define __GTK_STATUSBAR_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_STATUSBAR_ACCESSIBLE_H__
-#define __GTK_STATUSBAR_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkswitchaccessible.h b/gtk/a11y/gtkswitchaccessible.h
index 93f2f49d22..c4f364aafa 100644
--- a/gtk/a11y/gtkswitchaccessible.h
+++ b/gtk/a11y/gtkswitchaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_SWITCH_ACCESSIBLE_H__
+#define __GTK_SWITCH_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_SWITCH_ACCESSIBLE_H__
-#define __GTK_SWITCH_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtktextcellaccessible.h b/gtk/a11y/gtktextcellaccessible.h
index 3d9b4ad88e..9a1af36690 100644
--- a/gtk/a11y/gtktextcellaccessible.h
+++ b/gtk/a11y/gtktextcellaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TEXT_CELL_ACCESSIBLE_H__
+#define __GTK_TEXT_CELL_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_TEXT_CELL_ACCESSIBLE_H__
-#define __GTK_TEXT_CELL_ACCESSIBLE_H__
-
#include <atk/atk.h>
#include <gtk/a11y/gtkrenderercellaccessible.h>
diff --git a/gtk/a11y/gtktextviewaccessible.h b/gtk/a11y/gtktextviewaccessible.h
index 237120c159..e9c5987232 100644
--- a/gtk/a11y/gtktextviewaccessible.h
+++ b/gtk/a11y/gtktextviewaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TEXT_VIEW_ACCESSIBLE_H__
+#define __GTK_TEXT_VIEW_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_TEXT_VIEW_ACCESSIBLE_H__
-#define __GTK_TEXT_VIEW_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtktogglebuttonaccessible.h b/gtk/a11y/gtktogglebuttonaccessible.h
index 0749a0e019..6aef7712e1 100644
--- a/gtk/a11y/gtktogglebuttonaccessible.h
+++ b/gtk/a11y/gtktogglebuttonaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TOGGLE_BUTTON_ACCESSIBLE_H__
+#define __GTK_TOGGLE_BUTTON_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_TOGGLE_BUTTON_ACCESSIBLE_H__
-#define __GTK_TOGGLE_BUTTON_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkbuttonaccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtktoplevelaccessible.h b/gtk/a11y/gtktoplevelaccessible.h
index f2982b4fee..70815d354e 100644
--- a/gtk/a11y/gtktoplevelaccessible.h
+++ b/gtk/a11y/gtktoplevelaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TOPLEVEL_ACCESSIBLE_H__
+#define __GTK_TOPLEVEL_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_TOPLEVEL_ACCESSIBLE_H__
-#define __GTK_TOPLEVEL_ACCESSIBLE_H__
-
#include <atk/atk.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtktreeviewaccessible.h b/gtk/a11y/gtktreeviewaccessible.h
index 1efdd10201..01c7c34d8f 100644
--- a/gtk/a11y/gtktreeviewaccessible.h
+++ b/gtk/a11y/gtktreeviewaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TREE_VIEW_ACCESSIBLE_H__
+#define __GTK_TREE_VIEW_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_TREE_VIEW_ACCESSIBLE_H__
-#define __GTK_TREE_VIEW_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkwidgetaccessible.h b/gtk/a11y/gtkwidgetaccessible.h
index da96658739..5ead23df8d 100644
--- a/gtk/a11y/gtkwidgetaccessible.h
+++ b/gtk/a11y/gtkwidgetaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_WIDGET_ACCESSIBLE_H__
+#define __GTK_WIDGET_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_WIDGET_ACCESSIBLE_H__
-#define __GTK_WIDGET_ACCESSIBLE_H__
-
#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/a11y/gtkwindowaccessible.h b/gtk/a11y/gtkwindowaccessible.h
index a91f0942ae..990cc81248 100644
--- a/gtk/a11y/gtkwindowaccessible.h
+++ b/gtk/a11y/gtkwindowaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_WINDOW_ACCESSIBLE_H__
+#define __GTK_WINDOW_ACCESSIBLE_H__
+
#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#ifndef __GTK_WINDOW_ACCESSIBLE_H__
-#define __GTK_WINDOW_ACCESSIBLE_H__
-
#include <gtk/a11y/gtkcontaineraccessible.h>
G_BEGIN_DECLS
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
diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h
index eae37f3f7f..fd96ae2287 100644
--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@@ -20,13 +20,13 @@
Author: Anders Carlsson <andersca@codefactory.se>
*/
+#ifndef __GTK_ABOUT_DIALOG_H__
+#define __GTK_ABOUT_DIALOG_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_ABOUT_DIALOG_H__
-#define __GTK_ABOUT_DIALOG_H__
-
#include <gtk/gtkdialog.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index 6274a44b6d..fe8b1f779b 100644
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.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_ACCEL_GROUP_H__
#define __GTK_ACCEL_GROUP_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>
diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h
index bf247f11ce..f7b6084931 100644
--- a/gtk/gtkaccellabel.h
+++ b/gtk/gtkaccellabel.h
@@ -25,14 +25,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_ACCEL_LABEL_H__
#define __GTK_ACCEL_LABEL_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtklabel.h>
diff --git a/gtk/gtkaccelmap.h b/gtk/gtkaccelmap.h
index e77fb837eb..8612f18017 100644
--- a/gtk/gtkaccelmap.h
+++ b/gtk/gtkaccelmap.h
@@ -15,14 +15,14 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#ifndef __GTK_ACCEL_MAP_H__
#define __GTK_ACCEL_MAP_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkaccelgroup.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkaccelmapprivate.h b/gtk/gtkaccelmapprivate.h
index 6f5b027afd..e825dd3abe 100644
--- a/gtk/gtkaccelmapprivate.h
+++ b/gtk/gtkaccelmapprivate.h
@@ -15,14 +15,14 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#ifndef __GTK_ACCEL_MAP_PRIVATE_H__
#define __GTK_ACCEL_MAP_PRIVATE_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkaccelmap.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h
index 54792242a3..3f171088fb 100644
--- a/gtk/gtkaccessible.h
+++ b/gtk/gtkaccessible.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_ACCESSIBLE_H__
+#define __GTK_ACCESSIBLE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_ACCESSIBLE_H__
-#define __GTK_ACCESSIBLE_H__
-
#include <atk/atk.h>
#include <gtk/gtkwidget.h>
diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index 944fb29754..1cac38f237 100644
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -26,13 +26,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_ACTION_H__
+#define __GTK_ACTION_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_ACTION_H__
-#define __GTK_ACTION_H__
-
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 97ac90369f..94a378244b 100644
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -26,13 +26,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_ACTION_GROUP_H__
+#define __GTK_ACTION_GROUP_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_ACTION_GROUP_H__
-#define __GTK_ACTION_GROUP_H__
-
#include <gtk/gtkaction.h>
#include <gtk/gtkstock.h>
diff --git a/gtk/gtkactivatable.h b/gtk/gtkactivatable.h
index 6b13c176f4..4ff90f8e12 100644
--- a/gtk/gtkactivatable.h
+++ b/gtk/gtkactivatable.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_ACTIVATABLE_H__
+#define __GTK_ACTIVATABLE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_ACTIVATABLE_H__
-#define __GTK_ACTIVATABLE_H__
-
#include <gtk/gtkaction.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index 8af9685151..ebb6c4c3cd 100644
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_ADJUSTMENT_H__
+#define __GTK_ADJUSTMENT_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_ADJUSTMENT_H__
-#define __GTK_ADJUSTMENT_H__
-
#include <gdk/gdk.h>
#include <gtk/gtktypes.h>
diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h
index 9720cbcb21..50a5dc4f86 100644
--- a/gtk/gtkalignment.h
+++ b/gtk/gtkalignment.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_ALIGNMENT_H__
#define __GTK_ALIGNMENT_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkbin.h>
diff --git a/gtk/gtkappchooser.h b/gtk/gtkappchooser.h
index 29143e834d..33d18aab67 100644
--- a/gtk/gtkappchooser.h
+++ b/gtk/gtkappchooser.h
@@ -19,13 +19,13 @@
* Authors: Cosimo Cecchi <ccecchi@redhat.com>
*/
+#ifndef __GTK_APP_CHOOSER_H__
+#define __GTK_APP_CHOOSER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_APP_CHOOSER_H__
-#define __GTK_APP_CHOOSER_H__
-
#include <glib.h>
#include <gio/gio.h>
diff --git a/gtk/gtkappchooserbutton.h b/gtk/gtkappchooserbutton.h
index fae9800717..9d66be859a 100644
--- a/gtk/gtkappchooserbutton.h
+++ b/gtk/gtkappchooserbutton.h
@@ -19,13 +19,13 @@
* Authors: Cosimo Cecchi <ccecchi@redhat.com>
*/
+#ifndef __GTK_APP_CHOOSER_BUTTON_H__
+#define __GTK_APP_CHOOSER_BUTTON_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_APP_CHOOSER_BUTTON_H__
-#define __GTK_APP_CHOOSER_BUTTON_H__
-
#include <gtk/gtkcombobox.h>
#include <gio/gio.h>
diff --git a/gtk/gtkappchooserdialog.h b/gtk/gtkappchooserdialog.h
index 1958ec307d..c1dcda32ed 100644
--- a/gtk/gtkappchooserdialog.h
+++ b/gtk/gtkappchooserdialog.h
@@ -22,13 +22,13 @@
* Cosimo Cecchi <ccecchi@redhat.com>
*/
+#ifndef __GTK_APP_CHOOSER_DIALOG_H__
+#define __GTK_APP_CHOOSER_DIALOG_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_APP_CHOOSER_DIALOG_H__
-#define __GTK_APP_CHOOSER_DIALOG_H__
-
#include <gtk/gtkdialog.h>
#include <gio/gio.h>
diff --git a/gtk/gtkappchooserwidget.h b/gtk/gtkappchooserwidget.h
index a80555ebfa..9434207de0 100644
--- a/gtk/gtkappchooserwidget.h
+++ b/gtk/gtkappchooserwidget.h
@@ -22,13 +22,13 @@
* Cosimo Cecchi <ccecchi@redhat.com>
*/
+#ifndef __GTK_APP_CHOOSER_WIDGET_H__
+#define __GTK_APP_CHOOSER_WIDGET_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_APP_CHOOSER_WIDGET_H__
-#define __GTK_APP_CHOOSER_WIDGET_H__
-
#include <gtk/gtkbox.h>
#include <gtk/gtkmenu.h>
#include <gio/gio.h>
diff --git a/gtk/gtkapplication.h b/gtk/gtkapplication.h
index d3545623fb..7a6f8c2d20 100644
--- a/gtk/gtkapplication.h
+++ b/gtk/gtkapplication.h
@@ -17,13 +17,13 @@
* Author: Ryan Lortie <desrt@desrt.ca>
*/
+#ifndef __GTK_APPLICATION_H__
+#define __GTK_APPLICATION_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_APPLICATION_H__
-#define __GTK_APPLICATION_H__
-
#include <gtk/gtkwidget.h>
#include <gio/gio.h>
diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h
index 009e2c1aa0..0ab1bf84f6 100644
--- a/gtk/gtkarrow.h
+++ b/gtk/gtkarrow.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_ARROW_H__
#define __GTK_ARROW_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkmisc.h>
diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
index 5585561cef..c79f211b2a 100644
--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.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_ASPECT_FRAME_H__
#define __GTK_ASPECT_FRAME_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkframe.h>
diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h
index 03764af368..8ac451bfaa 100644
--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@@ -21,13 +21,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_ASSISTANT_H__
+#define __GTK_ASSISTANT_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_ASSISTANT_H__
-#define __GTK_ASSISTANT_H__
-
#include <gtk/gtkwindow.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h
index 46e488a2cc..812f516fd8 100644
--- a/gtk/gtkbbox.h
+++ b/gtk/gtkbbox.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_BUTTON_BOX_H__
+#define __GTK_BUTTON_BOX_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_BUTTON_BOX_H__
-#define __GTK_BUTTON_BOX_H__
-
#include <gtk/gtkbox.h>
diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h
index 6d96576926..1ec0fa3cfa 100644
--- a/gtk/gtkbin.h
+++ b/gtk/gtkbin.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_BIN_H__
#define __GTK_BIN_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkcontainer.h>
diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
index 4d23ed7b77..fb911f78bd 100644
--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@@ -25,14 +25,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_BINDINGS_H__
#define __GTK_BINDINGS_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>
diff --git a/gtk/gtkborder.h b/gtk/gtkborder.h
index 1243e81981..8b700ef16a 100644
--- a/gtk/gtkborder.h
+++ b/gtk/gtkborder.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_BORDER_H__
+#define __GTK_BORDER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_BORDER_H__
-#define __GTK_BORDER_H__
-
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 3f80117af3..d51ccf08b6 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.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_BOX_H__
#define __GTK_BOX_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkcontainer.h>
diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index 2a1f65e929..f9809a1936 100644
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_BUILDABLE_H__
+#define __GTK_BUILDABLE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_BUILDABLE_H__
-#define __GTK_BUILDABLE_H__
-
#include <gtk/gtkbuilder.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h
index e70546781c..31e5a24039 100644
--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_BUILDER_H__
+#define __GTK_BUILDER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_BUILDER_H__
-#define __GTK_BUILDER_H__
-
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index 9166db0cf1..d46f181eff 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.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_BUTTON_H__
#define __GTK_BUTTON_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkbin.h>
#include <gtk/gtkimage.h>
diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h
index 8d745fa1c9..7745c62751 100644
--- a/gtk/gtkcalendar.h
+++ b/gtk/gtkcalendar.h
@@ -25,14 +25,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_CALENDAR_H__
#define __GTK_CALENDAR_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkwidget.h>
diff --git a/gtk/gtkcellarea.h b/gtk/gtkcellarea.h
index 23fd02bd8f..0f4583712b 100644
--- a/gtk/gtkcellarea.h
+++ b/gtk/gtkcellarea.h
@@ -19,13 +19,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_AREA_H__
+#define __GTK_CELL_AREA_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CELL_AREA_H__
-#define __GTK_CELL_AREA_H__
-
#include <gtk/gtkcellrenderer.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtktreemodel.h>
diff --git a/gtk/gtkcellareabox.h b/gtk/gtkcellareabox.h
index 5deccd9a12..854faa0fe3 100644
--- a/gtk/gtkcellareabox.h
+++ b/gtk/gtkcellareabox.h
@@ -19,13 +19,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_AREA_BOX_H__
+#define __GTK_CELL_AREA_BOX_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CELL_AREA_BOX_H__
-#define __GTK_CELL_AREA_BOX_H__
-
#include <gtk/gtkcellarea.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcellareaboxcontextprivate.h b/gtk/gtkcellareaboxcontextprivate.h
index 836e3e14ad..5feb7e6313 100644
--- a/gtk/gtkcellareaboxcontextprivate.h
+++ b/gtk/gtkcellareaboxcontextprivate.h
@@ -19,13 +19,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_AREA_BOX_CONTEXT_H__
+#define __GTK_CELL_AREA_BOX_CONTEXT_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CELL_AREA_BOX_CONTEXT_H__
-#define __GTK_CELL_AREA_BOX_CONTEXT_H__
-
#include <gtk/gtkcellareacontext.h>
#include <gtk/gtkcellareabox.h>
#include <gtk/gtkcellrenderer.h>
diff --git a/gtk/gtkcellareacontext.h b/gtk/gtkcellareacontext.h
index 7daca086d1..c42aba7b87 100644
--- a/gtk/gtkcellareacontext.h
+++ b/gtk/gtkcellareacontext.h
@@ -19,13 +19,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_AREA_CONTEXT_H__
+#define __GTK_CELL_AREA_CONTEXT_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CELL_AREA_CONTEXT_H__
-#define __GTK_CELL_AREA_CONTEXT_H__
-
#include <gtk/gtkcellarea.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcelleditable.h b/gtk/gtkcelleditable.h
index 7cd3fbf718..ae97d9ad72 100644
--- a/gtk/gtkcelleditable.h
+++ b/gtk/gtkcelleditable.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_EDITABLE_H__
+#define __GTK_CELL_EDITABLE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CELL_EDITABLE_H__
-#define __GTK_CELL_EDITABLE_H__
-
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcelllayout.h b/gtk/gtkcelllayout.h
index 28dfcaa635..8870c67d86 100644
--- a/gtk/gtkcelllayout.h
+++ b/gtk/gtkcelllayout.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_LAYOUT_H__
+#define __GTK_CELL_LAYOUT_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CELL_LAYOUT_H__
-#define __GTK_CELL_LAYOUT_H__
-
#include <gtk/gtkcellrenderer.h>
#include <gtk/gtkcellarea.h>
#include <gtk/gtkbuildable.h>
diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index dc8263ed17..3eee3088ca 100644
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_RENDERER_H__
+#define __GTK_CELL_RENDERER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CELL_RENDERER_H__
-#define __GTK_CELL_RENDERER_H__
-
#include <gtk/gtkcelleditable.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcellrendereraccel.h b/gtk/gtkcellrendereraccel.h
index a4fe49c715..80391d7300 100644
--- a/gtk/gtkcellrendereraccel.h
+++ b/gtk/gtkcellrendereraccel.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_RENDERER_ACCEL_H__
+#define __GTK_CELL_RENDERER_ACCEL_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CELL_RENDERER_ACCEL_H__
-#define __GTK_CELL_RENDERER_ACCEL_H__
-
#include <gtk/gtkcellrenderertext.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcellrenderercombo.h b/gtk/gtkcellrenderercombo.h
index acbbbf4cc5..52e87eb833 100644
--- a/gtk/gtkcellrenderercombo.h
+++ b/gtk/gtkcellrenderercombo.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_RENDERER_COMBO_H__
+#define __GTK_CELL_RENDERER_COMBO_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CELL_RENDERER_COMBO_H__
-#define __GTK_CELL_RENDERER_COMBO_H__
-
#include <gtk/gtktreemodel.h>
#include <gtk/gtkcellrenderertext.h>
diff --git a/gtk/gtkcellrendererpixbuf.h b/gtk/gtkcellrendererpixbuf.h
index 3417b4d819..0a7a4f6951 100644
--- a/gtk/gtkcellrendererpixbuf.h
+++ b/gtk/gtkcellrendererpixbuf.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_RENDERER_PIXBUF_H__
+#define __GTK_CELL_RENDERER_PIXBUF_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CELL_RENDERER_PIXBUF_H__
-#define __GTK_CELL_RENDERER_PIXBUF_H__
-
#include <gtk/gtkcellrenderer.h>
diff --git a/gtk/gtkcellrendererprogress.h b/gtk/gtkcellrendererprogress.h
index 809d062bad..ab728bf73e 100644
--- a/gtk/gtkcellrendererprogress.h
+++ b/gtk/gtkcellrendererprogress.h
@@ -23,13 +23,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_CELL_RENDERER_PROGRESS_H__
+#define __GTK_CELL_RENDERER_PROGRESS_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CELL_RENDERER_PROGRESS_H__
-#define __GTK_CELL_RENDERER_PROGRESS_H__
-
#include <gtk/gtkcellrenderer.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcellrendererspin.h b/gtk/gtkcellrendererspin.h
index 56e3bc7265..dc949b80f3 100644
--- a/gtk/gtkcellrendererspin.h
+++ b/gtk/gtkcellrendererspin.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_RENDERER_SPIN_H__
+#define __GTK_CELL_RENDERER_SPIN_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CELL_RENDERER_SPIN_H__
-#define __GTK_CELL_RENDERER_SPIN_H__
-
#include <gtk/gtkcellrenderertext.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcellrendererspinner.h b/gtk/gtkcellrendererspinner.h
index 7ce0a80261..3d2d01f5ba 100644
--- a/gtk/gtkcellrendererspinner.h
+++ b/gtk/gtkcellrendererspinner.h
@@ -18,13 +18,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_RENDERER_SPINNER_H__
+#define __GTK_CELL_RENDERER_SPINNER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CELL_RENDERER_SPINNER_H__
-#define __GTK_CELL_RENDERER_SPINNER_H__
-
#include <gtk/gtkcellrenderer.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h
index 82c94df3f0..571e90d56f 100644
--- a/gtk/gtkcellrenderertext.h
+++ b/gtk/gtkcellrenderertext.h
@@ -15,14 +15,14 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#ifndef __GTK_CELL_RENDERER_TEXT_H__
#define __GTK_CELL_RENDERER_TEXT_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkcellrenderer.h>
diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h
index dd26c747a7..9f036e4c74 100644
--- a/gtk/gtkcellrenderertoggle.h
+++ b/gtk/gtkcellrenderertoggle.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_RENDERER_TOGGLE_H__
+#define __GTK_CELL_RENDERER_TOGGLE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CELL_RENDERER_TOGGLE_H__
-#define __GTK_CELL_RENDERER_TOGGLE_H__
-
#include <gtk/gtkcellrenderer.h>
diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h
index 3a02b02e1d..82e956e643 100644
--- a/gtk/gtkcellview.h
+++ b/gtk/gtkcellview.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_CELL_VIEW_H__
+#define __GTK_CELL_VIEW_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CELL_VIEW_H__
-#define __GTK_CELL_VIEW_H__
-
#include <gtk/gtkwidget.h>
#include <gtk/gtkcellrenderer.h>
#include <gtk/gtkcellarea.h>
diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h
index cf33b68ecf..c9b58805d1 100644
--- a/gtk/gtkcheckbutton.h
+++ b/gtk/gtkcheckbutton.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_CHECK_BUTTON_H__
#define __GTK_CHECK_BUTTON_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtktogglebutton.h>
diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h
index 0a2fe644ec..c793bcd8d3 100644
--- a/gtk/gtkcheckmenuitem.h
+++ b/gtk/gtkcheckmenuitem.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_CHECK_MENU_ITEM_H__
#define __GTK_CHECK_MENU_ITEM_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkmenuitem.h>
diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h
index d47dba159d..b04eea4d49 100644
--- a/gtk/gtkclipboard.h
+++ b/gtk/gtkclipboard.h
@@ -17,13 +17,13 @@
* Global clipboard abstraction.
*/
+#ifndef __GTK_CLIPBOARD_H__
+#define __GTK_CLIPBOARD_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_CLIPBOARD_H__
-#define __GTK_CLIPBOARD_H__
-
#include <gtk/gtkselection.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h
index 3dd7f39a3e..6fc7f464f7 100644
--- a/gtk/gtkcolorbutton.h
+++ b/gtk/gtkcolorbutton.h
@@ -27,14 +27,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_COLOR_BUTTON_H__
#define __GTK_COLOR_BUTTON_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkbutton.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcolorchooser.h b/gtk/gtkcolorchooser.h
index 6d3a891c56..192189544f 100644
--- a/gtk/gtkcolorchooser.h
+++ b/gtk/gtkcolorchooser.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_COLOR_CHOOSER_H__
+#define __GTK_COLOR_CHOOSER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_COLOR_CHOOSER_H__
-#define __GTK_COLOR_CHOOSER_H__
-
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcolorchooserdialog.h b/gtk/gtkcolorchooserdialog.h
index 9d656430b3..7288beda47 100644
--- a/gtk/gtkcolorchooserdialog.h
+++ b/gtk/gtkcolorchooserdialog.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_COLOR_CHOOSER_DIALOG_H__
+#define __GTK_COLOR_CHOOSER_DIALOG_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_COLOR_CHOOSER_DIALOG_H__
-#define __GTK_COLOR_CHOOSER_DIALOG_H__
-
#include <gtk/gtkdialog.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcolorchooserwidget.h b/gtk/gtkcolorchooserwidget.h
index beecc78ad1..f47bc3084b 100644
--- a/gtk/gtkcolorchooserwidget.h
+++ b/gtk/gtkcolorchooserwidget.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_COLOR_CHOOSER_WIDGET_H__
+#define __GTK_COLOR_CHOOSER_WIDGET_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_COLOR_CHOOSER_WIDGET_H__
-#define __GTK_COLOR_CHOOSER_WIDGET_H__
-
#include <gtk/gtkbox.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcoloreditorprivate.h b/gtk/gtkcoloreditorprivate.h
index 83070280ab..51a31234e1 100644
--- a/gtk/gtkcoloreditorprivate.h
+++ b/gtk/gtkcoloreditorprivate.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_COLOR_EDITOR_H__
+#define __GTK_COLOR_EDITOR_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_COLOR_EDITOR_H__
-#define __GTK_COLOR_EDITOR_H__
-
#include <gtk/gtkbox.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcolorplaneprivate.h b/gtk/gtkcolorplaneprivate.h
index b9c372e514..01c1ddb11b 100644
--- a/gtk/gtkcolorplaneprivate.h
+++ b/gtk/gtkcolorplaneprivate.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_COLOR_PLANE_H__
+#define __GTK_COLOR_PLANE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_COLOR_PLANE_H__
-#define __GTK_COLOR_PLANE_H__
-
#include <gtk/gtkdrawingarea.h>
#include <gtk/gtktypes.h>
diff --git a/gtk/gtkcolorscaleprivate.h b/gtk/gtkcolorscaleprivate.h
index 5d3b5d2a7a..1b843f3135 100644
--- a/gtk/gtkcolorscaleprivate.h
+++ b/gtk/gtkcolorscaleprivate.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_COLOR_SCALE_H__
+#define __GTK_COLOR_SCALE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_COLOR_SCALE_H__
-#define __GTK_COLOR_SCALE_H__
-
#include <gtk/gtkscale.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcolorswatchprivate.h b/gtk/gtkcolorswatchprivate.h
index e43ac2c386..67ed17525a 100644
--- a/gtk/gtkcolorswatchprivate.h
+++ b/gtk/gtkcolorswatchprivate.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_COLOR_SWATCH_H__
+#define __GTK_COLOR_SWATCH_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_COLOR_SWATCH_H__
-#define __GTK_COLOR_SWATCH_H__
-
#include <gtk/gtkdrawingarea.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcolorutils.h b/gtk/gtkcolorutils.h
index 8fdef92f57..8cb8c21d91 100644
--- a/gtk/gtkcolorutils.h
+++ b/gtk/gtkcolorutils.h
@@ -27,13 +27,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_COLOR_UTILS_H__
+#define __GTK_COLOR_UTILS_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_COLOR_UTILS_H__
-#define __GTK_COLOR_UTILS_H__
-
#include <glib.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index 8378d2df77..03d25ff3d0 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_COMBO_BOX_H__
+#define __GTK_COMBO_BOX_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_COMBO_BOX_H__
-#define __GTK_COMBO_BOX_H__
-
#include <gtk/gtkbin.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreeview.h>
diff --git a/gtk/gtkcomboboxtext.h b/gtk/gtkcomboboxtext.h
index d1c362f30c..c31c9c2231 100644
--- a/gtk/gtkcomboboxtext.h
+++ b/gtk/gtkcomboboxtext.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_COMBO_BOX_TEXT_H__
+#define __GTK_COMBO_BOX_TEXT_H__
+
#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_COMBO_BOX_TEXT_H__
-#define __GTK_COMBO_BOX_TEXT_H__
-
#include <gtk/gtkcombobox.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 2db24889b5..3bcd2b1cc3 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.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_CONTAINER_H__
#define __GTK_CONTAINER_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkwidget.h>
diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
index 1eed41a2b9..ecc9a70d75 100644
--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_DEBUG_H__
+#define __GTK_DEBUG_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_DEBUG_H__
-#define __GTK_DEBUG_H__
-
#include <glib.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index d73aef7c6b..1d941c7ef1 100644
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.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_DIALOG_H__
#define __GTK_DIALOG_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkwindow.h>
diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index 4eaa05631f..3a2b4c27cd 100644
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -23,14 +23,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_DND_H__
#define __GTK_DND_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkwidget.h>
#include <gtk/gtkselection.h>
diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h
index 1029b249d0..b617fda51d 100644
--- a/gtk/gtkdrawingarea.h
+++ b/gtk/gtkdrawingarea.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_DRAWING_AREA_H__
#define __GTK_DRAWING_AREA_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkwidget.h>
diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h
index 15758dbbec..0e2441c4df 100644
--- a/gtk/gtkeditable.h
+++ b/gtk/gtkeditable.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_EDITABLE_H__
#define __GTK_EDITABLE_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkwidget.h>
diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index 50ca934bd4..425547f9ea 100644
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.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_ENTRY_H__
#define __GTK_ENTRY_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkeditable.h>
#include <gtk/gtkimcontext.h>
#include <gtk/gtkmenu.h>
diff --git a/gtk/gtkentrybuffer.h b/gtk/gtkentrybuffer.h
index 04570b7dd9..8cf5a60871 100644
--- a/gtk/gtkentrybuffer.h
+++ b/gtk/gtkentrybuffer.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_ENTRY_BUFFER_H__
+#define __GTK_ENTRY_BUFFER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_ENTRY_BUFFER_H__
-#define __GTK_ENTRY_BUFFER_H__
-
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h
index 726685c75b..b0f19c8780 100644
--- a/gtk/gtkentrycompletion.h
+++ b/gtk/gtkentrycompletion.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_ENTRY_COMPLETION_H__
+#define __GTK_ENTRY_COMPLETION_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_ENTRY_COMPLETION_H__
-#define __GTK_ENTRY_COMPLETION_H__
-
#include <gtk/gtktreemodel.h>
#include <gtk/gtkliststore.h>
#include <gtk/gtkcellarea.h>
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index daff2f0ddf..9264d9f01a 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_ENUMS_H__
+#define __GTK_ENUMS_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_ENUMS_H__
-#define __GTK_ENUMS_H__
-
#include <glib-object.h>
diff --git a/gtk/gtkeventbox.h b/gtk/gtkeventbox.h
index adada8cbcd..36c2a16fdd 100644
--- a/gtk/gtkeventbox.h
+++ b/gtk/gtkeventbox.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_EVENT_BOX_H__
#define __GTK_EVENT_BOX_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkbin.h>
diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h
index a9ca742392..2f9c7b1816 100644
--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@@ -19,13 +19,13 @@
* Mark McLoughlin <mark@skynet.ie>
*/
+#ifndef __GTK_EXPANDER_H__
+#define __GTK_EXPANDER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_EXPANDER_H__
-#define __GTK_EXPANDER_H__
-
#include <gtk/gtkbin.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkfilechooser.h b/gtk/gtkfilechooser.h
index 6e7d416804..6ff9f08b8b 100644
--- a/gtk/gtkfilechooser.h
+++ b/gtk/gtkfilechooser.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_FILE_CHOOSER_H__
+#define __GTK_FILE_CHOOSER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_FILE_CHOOSER_H__
-#define __GTK_FILE_CHOOSER_H__
-
#include <gtk/gtkfilefilter.h>
#include <gtk/gtkwidget.h>
diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h
index ae02a763f0..2caadf3927 100644
--- a/gtk/gtkfilechooserbutton.h
+++ b/gtk/gtkfilechooserbutton.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_FILE_CHOOSER_BUTTON_H__
+#define __GTK_FILE_CHOOSER_BUTTON_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_FILE_CHOOSER_BUTTON_H__
-#define __GTK_FILE_CHOOSER_BUTTON_H__
-
#include <gtk/gtkbox.h>
#include <gtk/gtkfilechooser.h>
diff --git a/gtk/gtkfilechooserdialog.h b/gtk/gtkfilechooserdialog.h
index 1b5ec12e55..6ce77e8828 100644
--- a/gtk/gtkfilechooserdialog.h
+++ b/gtk/gtkfilechooserdialog.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_FILE_CHOOSER_DIALOG_H__
+#define __GTK_FILE_CHOOSER_DIALOG_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_FILE_CHOOSER_DIALOG_H__
-#define __GTK_FILE_CHOOSER_DIALOG_H__
-
#include <gtk/gtkdialog.h>
#include <gtk/gtkfilechooser.h>
diff --git a/gtk/gtkfilechooserwidget.h b/gtk/gtkfilechooserwidget.h
index 841567c1c1..00b55cbd93 100644
--- a/gtk/gtkfilechooserwidget.h
+++ b/gtk/gtkfilechooserwidget.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_FILE_CHOOSER_WIDGET_H__
+#define __GTK_FILE_CHOOSER_WIDGET_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_FILE_CHOOSER_WIDGET_H__
-#define __GTK_FILE_CHOOSER_WIDGET_H__
-
#include <gtk/gtkfilechooser.h>
#include <gtk/gtkbox.h>
diff --git a/gtk/gtkfilefilter.h b/gtk/gtkfilefilter.h
index b7c6c68500..ab952dee7e 100644
--- a/gtk/gtkfilefilter.h
+++ b/gtk/gtkfilefilter.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_FILE_FILTER_H__
+#define __GTK_FILE_FILTER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_FILE_FILTER_H__
-#define __GTK_FILE_FILTER_H__
-
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h
index 50a00ce459..c7746bd9ce 100644
--- a/gtk/gtkfixed.h
+++ b/gtk/gtkfixed.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_FIXED_H__
#define __GTK_FIXED_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkcontainer.h>
diff --git a/gtk/gtkfontbutton.h b/gtk/gtkfontbutton.h
index 51754980b2..e511281434 100644
--- a/gtk/gtkfontbutton.h
+++ b/gtk/gtkfontbutton.h
@@ -23,13 +23,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_FONT_BUTTON_H__
+#define __GTK_FONT_BUTTON_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_FONT_BUTTON_H__
-#define __GTK_FONT_BUTTON_H__
-
#include <gtk/gtkbutton.h>
diff --git a/gtk/gtkfontchooser.h b/gtk/gtkfontchooser.h
index f91667c966..1c1bbf09b1 100644
--- a/gtk/gtkfontchooser.h
+++ b/gtk/gtkfontchooser.h
@@ -18,13 +18,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_FONT_CHOOSER_H__
+#define __GTK_FONT_CHOOSER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_FONT_CHOOSER_H__
-#define __GTK_FONT_CHOOSER_H__
-
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkfontchooserdialog.h b/gtk/gtkfontchooserdialog.h
index ad8d7c73c3..d4a18e5826 100644
--- a/gtk/gtkfontchooserdialog.h
+++ b/gtk/gtkfontchooserdialog.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_FONT_CHOOSER_DIALOG_H__
+#define __GTK_FONT_CHOOSER_DIALOG_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_FONT_CHOOSER_DIALOG_H__
-#define __GTK_FONT_CHOOSER_DIALOG_H__
-
#include <gtk/gtkdialog.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkfontchooserwidget.h b/gtk/gtkfontchooserwidget.h
index c998085900..662f9326e8 100644
--- a/gtk/gtkfontchooserwidget.h
+++ b/gtk/gtkfontchooserwidget.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_FONT_CHOOSER_WIDGET_H__
+#define __GTK_FONT_CHOOSER_WIDGET_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_FONT_CHOOSER_WIDGET_H__
-#define __GTK_FONT_CHOOSER_WIDGET_H__
-
#include <gtk/gtkbox.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 2d981f0fab..ffc90c9017 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.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_FRAME_H__
#define __GTK_FRAME_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkbin.h>
diff --git a/gtk/gtkgrid.h b/gtk/gtkgrid.h
index 0c72d19222..0e37277ad7 100644
--- a/gtk/gtkgrid.h
+++ b/gtk/gtkgrid.h
@@ -16,14 +16,14 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#ifndef __GTK_GRID_H__
#define __GTK_GRID_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkcontainer.h>
diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index 8e49e62de4..fabf9288e0 100644
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_ICON_FACTORY_H__
+#define __GTK_ICON_FACTORY_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_ICON_FACTORY_H__
-#define __GTK_ICON_FACTORY_H__
-
#include <gdk/gdk.h>
#include <gtk/gtkenums.h>
#include <gtk/gtktypes.h>
diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index 3ecae6e93e..8852110cdb 100644
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_ICON_THEME_H__
+#define __GTK_ICON_THEME_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_ICON_THEME_H__
-#define __GTK_ICON_THEME_H__
-
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk/gdk.h>
#include <gtk/gtkstylecontext.h>
diff --git a/gtk/gtkiconview.h b/gtk/gtkiconview.h
index 554902eae0..49d796bf03 100644
--- a/gtk/gtkiconview.h
+++ b/gtk/gtkiconview.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_ICON_VIEW_H__
+#define __GTK_ICON_VIEW_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_ICON_VIEW_H__
-#define __GTK_ICON_VIEW_H__
-
#include <gtk/gtkcontainer.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtkcellrenderer.h>
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index 6fb45329db..023f20c5a4 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.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_IMAGE_H__
#define __GTK_IMAGE_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gio/gio.h>
#include <gtk/gtkmisc.h>
diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h
index f53cc6800f..1c53695173 100644
--- a/gtk/gtkimagemenuitem.h
+++ b/gtk/gtkimagemenuitem.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_IMAGE_MENU_ITEM_H__
#define __GTK_IMAGE_MENU_ITEM_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkmenuitem.h>
diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h
index 85025d9104..55fe53f871 100644
--- a/gtk/gtkimcontext.h
+++ b/gtk/gtkimcontext.h
@@ -15,14 +15,14 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#ifndef __GTK_IM_CONTEXT_H__
#define __GTK_IM_CONTEXT_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gdk/gdk.h>
diff --git a/gtk/gtkimcontextinfo.h b/gtk/gtkimcontextinfo.h
index 1c3fdae6e7..019b46dab0 100644
--- a/gtk/gtkimcontextinfo.h
+++ b/gtk/gtkimcontextinfo.h
@@ -15,14 +15,14 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#ifndef __GTK_IM_CONTEXT_INFO_H__
#define __GTK_IM_CONTEXT_INFO_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <glib.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h
index 03479c85bf..ddb467944f 100644
--- a/gtk/gtkimcontextsimple.h
+++ b/gtk/gtkimcontextsimple.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_IM_CONTEXT_SIMPLE_H__
+#define __GTK_IM_CONTEXT_SIMPLE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_IM_CONTEXT_SIMPLE_H__
-#define __GTK_IM_CONTEXT_SIMPLE_H__
-
#include <gtk/gtkimcontext.h>
diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h
index 08779a7e65..1979bf673c 100644
--- a/gtk/gtkimmulticontext.h
+++ b/gtk/gtkimmulticontext.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_IM_MULTICONTEXT_H__
+#define __GTK_IM_MULTICONTEXT_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_IM_MULTICONTEXT_H__
-#define __GTK_IM_MULTICONTEXT_H__
-
#include <gtk/gtkimcontext.h>
#include <gtk/gtkmenushell.h>
diff --git a/gtk/gtkinfobar.h b/gtk/gtkinfobar.h
index 9a3ca0ef31..a7e351a621 100644
--- a/gtk/gtkinfobar.h
+++ b/gtk/gtkinfobar.h
@@ -26,13 +26,13 @@
* Modified by the GTK+ Team, 2008-2009.
*/
+#ifndef __GTK_INFO_BAR_H__
+#define __GTK_INFO_BAR_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_INFO_BAR_H__
-#define __GTK_INFO_BAR_H__
-
#include <gtk/gtkbox.h>
#include <gtk/gtkenums.h>
diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h
index c5745680bb..9806da76c8 100644
--- a/gtk/gtkinvisible.h
+++ b/gtk/gtkinvisible.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_INVISIBLE_H__
+#define __GTK_INVISIBLE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_INVISIBLE_H__
-#define __GTK_INVISIBLE_H__
-
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 81c9ac8de9..3d3c27d66e 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.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_LABEL_H__
#define __GTK_LABEL_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkmisc.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtkmenu.h>
diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index f5b710e43a..04dcb51c57 100644
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.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_LAYOUT_H__
#define __GTK_LAYOUT_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkcontainer.h>
diff --git a/gtk/gtklevelbar.h b/gtk/gtklevelbar.h
index 99cc6b78e9..aab7064fa6 100644
--- a/gtk/gtklevelbar.h
+++ b/gtk/gtklevelbar.h
@@ -18,13 +18,13 @@
*
*/
+#ifndef __GTK_LEVEL_BAR_H__
+#define __GTK_LEVEL_BAR_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_LEVEL_BAR_H__
-#define __GTK_LEVEL_BAR_H__
-
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h
index 0de6685847..71e8707985 100644
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -21,13 +21,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_LINK_BUTTON_H__
+#define __GTK_LINK_BUTTON_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_LINK_BUTTON_H__
-#define __GTK_LINK_BUTTON_H__
-
#include <gtk/gtkbutton.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 568e10cd2b..1e61d5aba4 100644
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_LIST_STORE_H__
+#define __GTK_LIST_STORE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_LIST_STORE_H__
-#define __GTK_LIST_STORE_H__
-
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreesortable.h>
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index b2ae0a353a..549989afb5 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.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_MAIN_H__
#define __GTK_MAIN_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/gtkwidget.h>
#ifdef G_PLATFORM_WIN32
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index 1c50ca1301..d6843eba21 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.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_MENU_H__
#define __GTK_MENU_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkaccelgroup.h>
#include <gtk/gtkmenushell.h>
diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h
index 5529ecf8f1..5dc792f33d 100644
--- a/gtk/gtkmenubar.h
+++ b/gtk/gtkmenubar.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_MENU_BAR_H__
#define __GTK_MENU_BAR_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkmenushell.h>
diff --git a/gtk/gtkmenubutton.h b/gtk/gtkmenubutton.h
index 67c67c9a07..8aa2644cd2 100644
--- a/gtk/gtkmenubutton.h
+++ b/gtk/gtkmenubutton.h
@@ -18,13 +18,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_MENU_BUTTON_H__
+#define __GTK_MENU_BUTTON_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_MENU_BUTTON_H__
-#define __GTK_MENU_BUTTON_H__
-
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkmenu.h>
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index e9e6ef280c..9d546d6c3d 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_MENU_ITEM_H__
+#define __GTK_MENU_ITEM_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_MENU_ITEM_H__
-#define __GTK_MENU_ITEM_H__
-
#include <gtk/gtkbin.h>
diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h
index c0479e8ab3..c3bd8797e4 100644
--- a/gtk/gtkmenushell.h
+++ b/gtk/gtkmenushell.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_MENU_SHELL_H__
#define __GTK_MENU_SHELL_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkcontainer.h>
diff --git a/gtk/gtkmenutoolbutton.h b/gtk/gtkmenutoolbutton.h
index fb7977b549..50ee12ed9f 100644
--- a/gtk/gtkmenutoolbutton.h
+++ b/gtk/gtkmenutoolbutton.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_MENU_TOOL_BUTTON_H__
+#define __GTK_MENU_TOOL_BUTTON_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_MENU_TOOL_BUTTON_H__
-#define __GTK_MENU_TOOL_BUTTON_H__
-
#include <gtk/gtkmenu.h>
#include <gtk/gtktoolbutton.h>
diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h
index 5f5d1a9693..5d84caa208 100644
--- a/gtk/gtkmessagedialog.h
+++ b/gtk/gtkmessagedialog.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_MESSAGE_DIALOG_H__
+#define __GTK_MESSAGE_DIALOG_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_MESSAGE_DIALOG_H__
-#define __GTK_MESSAGE_DIALOG_H__
-
#include <gtk/gtkdialog.h>
#include <gtk/gtkenums.h>
diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h
index b767dd42c5..a652a0140f 100644
--- a/gtk/gtkmisc.h
+++ b/gtk/gtkmisc.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_MISC_H__
#define __GTK_MISC_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkwidget.h>
diff --git a/gtk/gtkmodules.h b/gtk/gtkmodules.h
index 594f99e1df..4aca3606ea 100644
--- a/gtk/gtkmodules.h
+++ b/gtk/gtkmodules.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_MODULES_H__
+#define __GTK_MODULES_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_MODULES_H__
-#define __GTK_MODULES_H__
-
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkmountoperation.h b/gtk/gtkmountoperation.h
index e75561cf96..cff736e188 100644
--- a/gtk/gtkmountoperation.h
+++ b/gtk/gtkmountoperation.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_MOUNT_OPERATION_H__
+#define __GTK_MOUNT_OPERATION_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_MOUNT_OPERATION_H__
-#define __GTK_MOUNT_OPERATION_H__
-
G_BEGIN_DECLS
#define GTK_TYPE_MOUNT_OPERATION (gtk_mount_operation_get_type ())
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index 5fa72af1d4..a0fea568e7 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -23,14 +23,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_NOTEBOOK_H__
#define __GTK_NOTEBOOK_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkcontainer.h>
diff --git a/gtk/gtknumerableicon.h b/gtk/gtknumerableicon.h
index 850506dccb..7f4d77a287 100644
--- a/gtk/gtknumerableicon.h
+++ b/gtk/gtknumerableicon.h
@@ -19,13 +19,13 @@
* Authors: Cosimo Cecchi <cosimoc@redhat.com>
*/
+#ifndef __GTK_NUMERABLE_ICON_H__
+#define __GTK_NUMERABLE_ICON_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_NUMERABLE_ICON_H__
-#define __GTK_NUMERABLE_ICON_H__
-
#include <gio/gio.h>
#include <gtk/gtkstylecontext.h>
diff --git a/gtk/gtkoffscreenwindow.h b/gtk/gtkoffscreenwindow.h
index 9b5837a6bc..d4592a0b53 100644
--- a/gtk/gtkoffscreenwindow.h
+++ b/gtk/gtkoffscreenwindow.h
@@ -16,13 +16,13 @@
* Alexander Larsson <alexl@redhat.com>
*/
+#ifndef __GTK_OFFSCREEN_WINDOW_H__
+#define __GTK_OFFSCREEN_WINDOW_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_OFFSCREEN_WINDOW_H__
-#define __GTK_OFFSCREEN_WINDOW_H__
-
#include <gtk/gtkwindow.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkorientable.h b/gtk/gtkorientable.h
index bdc34d31ba..2708a45597 100644
--- a/gtk/gtkorientable.h
+++ b/gtk/gtkorientable.h
@@ -19,13 +19,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_ORIENTABLE_H__
+#define __GTK_ORIENTABLE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_ORIENTABLE_H__
-#define __GTK_ORIENTABLE_H__
-
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkoverlay.h b/gtk/gtkoverlay.h
index fb186d3b9d..1f8883bc6b 100644
--- a/gtk/gtkoverlay.h
+++ b/gtk/gtkoverlay.h
@@ -18,13 +18,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_OVERLAY_H__
+#define __GTK_OVERLAY_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_OVERLAY_H__
-#define __GTK_OVERLAY_H__
-
#include <gtk/gtkbin.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h
index cd4607de04..86a414e7ab 100644
--- a/gtk/gtkpagesetup.h
+++ b/gtk/gtkpagesetup.h
@@ -16,14 +16,14 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#ifndef __GTK_PAGE_SETUP_H__
#define __GTK_PAGE_SETUP_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkpapersize.h>
diff --git a/gtk/gtkpagesetupunixdialog.h b/gtk/gtkpagesetupunixdialog.h
index 137bcd1022..7f8ceaff67 100644
--- a/gtk/gtkpagesetupunixdialog.h
+++ b/gtk/gtkpagesetupunixdialog.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_PAGE_SETUP_UNIX_DIALOG_H__
+#define __GTK_PAGE_SETUP_UNIX_DIALOG_H__
+
#if !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtkunixprint.h> can be included directly."
#endif
-#ifndef __GTK_PAGE_SETUP_UNIX_DIALOG_H__
-#define __GTK_PAGE_SETUP_UNIX_DIALOG_H__
-
#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h
index 67642a347e..55ec32c250 100644
--- a/gtk/gtkpaned.h
+++ b/gtk/gtkpaned.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_PANED_H__
+#define __GTK_PANED_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_PANED_H__
-#define __GTK_PANED_H__
-
#include <gtk/gtkcontainer.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h
index f3cfa6ed92..f7cf20da5e 100644
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -16,14 +16,14 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#ifndef __GTK_PAPER_SIZE_H__
#define __GTK_PAPER_SIZE_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkenums.h>
diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index 60156cef35..bd6a393cb8 100644
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_PLUG_H__
+#define __GTK_PLUG_H__
+
#if !defined (__GTKX_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtkx.h> can be included directly."
#endif
-#ifndef __GTK_PLUG_H__
-#define __GTK_PLUG_H__
-
#include <gdk/gdk.h>
#ifdef GDK_WINDOWING_X11
diff --git a/gtk/gtkpressandholdprivate.h b/gtk/gtkpressandholdprivate.h
index ccccca24f9..4dcc6986f6 100644
--- a/gtk/gtkpressandholdprivate.h
+++ b/gtk/gtkpressandholdprivate.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_PRESS_AND_HOLD_H__
+#define __GTK_PRESS_AND_HOLD_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_PRESS_AND_HOLD_H__
-#define __GTK_PRESS_AND_HOLD_H__
-
G_BEGIN_DECLS
#define GTK_TYPE_PRESS_AND_HOLD (gtk_press_and_hold_get_type ())
diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h
index 561d0c4572..aecd8a92b8 100644
--- a/gtk/gtkprintcontext.h
+++ b/gtk/gtkprintcontext.h
@@ -16,14 +16,14 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#ifndef __GTK_PRINT_CONTEXT_H__
#define __GTK_PRINT_CONTEXT_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <pango/pango.h>
#include <gtk/gtkpagesetup.h>
diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h
index 4c177adc12..2115fd15db 100644
--- a/gtk/gtkprinter.h
+++ b/gtk/gtkprinter.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_PRINTER_H__
+#define __GTK_PRINTER_H__
+
#if !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtkunixprint.h> can be included directly."
#endif
-#ifndef __GTK_PRINTER_H__
-#define __GTK_PRINTER_H__
-
#include <cairo.h>
#include <gtk/gtk.h>
diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h
index b78ab720fb..0c19802620 100644
--- a/gtk/gtkprintjob.h
+++ b/gtk/gtkprintjob.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_PRINT_JOB_H__
+#define __GTK_PRINT_JOB_H__
+
#if !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtkunixprint.h> can be included directly."
#endif
-#ifndef __GTK_PRINT_JOB_H__
-#define __GTK_PRINT_JOB_H__
-
#include <cairo.h>
#include <gtk/gtk.h>
diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index a1e8aec2a3..49a31ce971 100644
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -16,14 +16,14 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#ifndef __GTK_PRINT_OPERATION_H__
#define __GTK_PRINT_OPERATION_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <cairo.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkwindow.h>
diff --git a/gtk/gtkprintoperationpreview.h b/gtk/gtkprintoperationpreview.h
index e932e7cec8..e92376ba40 100644
--- a/gtk/gtkprintoperationpreview.h
+++ b/gtk/gtkprintoperationpreview.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_PRINT_OPERATION_PREVIEW_H__
+#define __GTK_PRINT_OPERATION_PREVIEW_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_PRINT_OPERATION_PREVIEW_H__
-#define __GTK_PRINT_OPERATION_PREVIEW_H__
-
#include <cairo.h>
#include <gtk/gtkprintcontext.h>
diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h
index 3323a7bc01..294dabd73c 100644
--- a/gtk/gtkprintsettings.h
+++ b/gtk/gtkprintsettings.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_PRINT_SETTINGS_H__
+#define __GTK_PRINT_SETTINGS_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_PRINT_SETTINGS_H__
-#define __GTK_PRINT_SETTINGS_H__
-
#include <gtk/gtkpapersize.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkprintunixdialog.h b/gtk/gtkprintunixdialog.h
index 8458aac42b..89e06abd2e 100644
--- a/gtk/gtkprintunixdialog.h
+++ b/gtk/gtkprintunixdialog.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_PRINT_UNIX_DIALOG_H__
+#define __GTK_PRINT_UNIX_DIALOG_H__
+
#if !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtkunixprint.h> can be included directly."
#endif
-#ifndef __GTK_PRINT_UNIX_DIALOG_H__
-#define __GTK_PRINT_UNIX_DIALOG_H__
-
#include <gtk/gtk.h>
#include <gtk/gtkprinter.h>
#include <gtk/gtkprintjob.h>
diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index ae07bdcfd0..9ae044b49c 100644
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_PROGRESS_BAR_H__
+#define __GTK_PROGRESS_BAR_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_PROGRESS_BAR_H__
-#define __GTK_PROGRESS_BAR_H__
-
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkradioaction.h b/gtk/gtkradioaction.h
index 84eac16ae3..fccdef72b1 100644
--- a/gtk/gtkradioaction.h
+++ b/gtk/gtkradioaction.h
@@ -26,13 +26,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_RADIO_ACTION_H__
+#define __GTK_RADIO_ACTION_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_RADIO_ACTION_H__
-#define __GTK_RADIO_ACTION_H__
-
#include <gtk/gtktoggleaction.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h
index 14ad10dec0..b4121a66e4 100644
--- a/gtk/gtkradiobutton.h
+++ b/gtk/gtkradiobutton.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_RADIO_BUTTON_H__
#define __GTK_RADIO_BUTTON_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkcheckbutton.h>
diff --git a/gtk/gtkradiomenuitem.h b/gtk/gtkradiomenuitem.h
index e9e36a5456..c365c99ed5 100644
--- a/gtk/gtkradiomenuitem.h
+++ b/gtk/gtkradiomenuitem.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_RADIO_MENU_ITEM_H__
#define __GTK_RADIO_MENU_ITEM_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkcheckmenuitem.h>
diff --git a/gtk/gtkradiotoolbutton.h b/gtk/gtkradiotoolbutton.h
index 3c5e605a84..95593fce56 100644
--- a/gtk/gtkradiotoolbutton.h
+++ b/gtk/gtkradiotoolbutton.h
@@ -18,13 +18,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_RADIO_TOOL_BUTTON_H__
+#define __GTK_RADIO_TOOL_BUTTON_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_RADIO_TOOL_BUTTON_H__
-#define __GTK_RADIO_TOOL_BUTTON_H__
-
#include <gtk/gtktoggletoolbutton.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index 99bbb7d3be..8495cdb78f 100644
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.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_RANGE_H__
#define __GTK_RANGE_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkwidget.h>
diff --git a/gtk/gtkrecentaction.h b/gtk/gtkrecentaction.h
index 016b587101..a0654df59b 100644
--- a/gtk/gtkrecentaction.h
+++ b/gtk/gtkrecentaction.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_RECENT_ACTION_H__
+#define __GTK_RECENT_ACTION_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_RECENT_ACTION_H__
-#define __GTK_RECENT_ACTION_H__
-
#include <gtk/gtkaction.h>
#include <gtk/gtkrecentmanager.h>
diff --git a/gtk/gtkrecentchooser.h b/gtk/gtkrecentchooser.h
index 945dfa0560..66626ca966 100644
--- a/gtk/gtkrecentchooser.h
+++ b/gtk/gtkrecentchooser.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_RECENT_CHOOSER_H__
+#define __GTK_RECENT_CHOOSER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_RECENT_CHOOSER_H__
-#define __GTK_RECENT_CHOOSER_H__
-
#include <gtk/gtkwidget.h>
#include <gtk/gtkrecentmanager.h>
#include <gtk/gtkrecentfilter.h>
diff --git a/gtk/gtkrecentchooserdialog.h b/gtk/gtkrecentchooserdialog.h
index 5d950b57db..ff557dbef5 100644
--- a/gtk/gtkrecentchooserdialog.h
+++ b/gtk/gtkrecentchooserdialog.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_RECENT_CHOOSER_DIALOG_H__
+#define __GTK_RECENT_CHOOSER_DIALOG_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_RECENT_CHOOSER_DIALOG_H__
-#define __GTK_RECENT_CHOOSER_DIALOG_H__
-
#include <gtk/gtkdialog.h>
#include <gtk/gtkrecentchooser.h>
diff --git a/gtk/gtkrecentchoosermenu.h b/gtk/gtkrecentchoosermenu.h
index b2a0277f18..0ce04f1049 100644
--- a/gtk/gtkrecentchoosermenu.h
+++ b/gtk/gtkrecentchoosermenu.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_RECENT_CHOOSER_MENU_H__
+#define __GTK_RECENT_CHOOSER_MENU_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_RECENT_CHOOSER_MENU_H__
-#define __GTK_RECENT_CHOOSER_MENU_H__
-
#include <gtk/gtkmenu.h>
#include <gtk/gtkrecentchooser.h>
diff --git a/gtk/gtkrecentchooserwidget.h b/gtk/gtkrecentchooserwidget.h
index 18a4042f20..460dd6c228 100644
--- a/gtk/gtkrecentchooserwidget.h
+++ b/gtk/gtkrecentchooserwidget.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_RECENT_CHOOSER_WIDGET_H__
+#define __GTK_RECENT_CHOOSER_WIDGET_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_RECENT_CHOOSER_WIDGET_H__
-#define __GTK_RECENT_CHOOSER_WIDGET_H__
-
#include <gtk/gtkrecentchooser.h>
#include <gtk/gtkbox.h>
diff --git a/gtk/gtkrecentfilter.h b/gtk/gtkrecentfilter.h
index 4f19c9bf98..3501ca8a87 100644
--- a/gtk/gtkrecentfilter.h
+++ b/gtk/gtkrecentfilter.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_RECENT_FILTER_H__
+#define __GTK_RECENT_FILTER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_RECENT_FILTER_H__
-#define __GTK_RECENT_FILTER_H__
-
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h
index 893a835704..a1d7500ead 100644
--- a/gtk/gtkrecentmanager.h
+++ b/gtk/gtkrecentmanager.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_RECENT_MANAGER_H__
+#define __GTK_RECENT_MANAGER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_RECENT_MANAGER_H__
-#define __GTK_RECENT_MANAGER_H__
-
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk/gdk.h>
#include <time.h>
diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index 51202e3c35..a54b38e9d7 100644
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.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_SCALE_H__
#define __GTK_SCALE_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkrange.h>
diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h
index 4ba4dc925e..7aff9ac6cf 100644
--- a/gtk/gtkscalebutton.h
+++ b/gtk/gtkscalebutton.h
@@ -31,13 +31,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_SCALE_BUTTON_H__
+#define __GTK_SCALE_BUTTON_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_SCALE_BUTTON_H__
-#define __GTK_SCALE_BUTTON_H__
-
#include <gtk/gtkbutton.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkscrollable.h b/gtk/gtkscrollable.h
index ba68e90f76..a6e292f977 100644
--- a/gtk/gtkscrollable.h
+++ b/gtk/gtkscrollable.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_SCROLLABLE_H__
+#define __GTK_SCROLLABLE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_SCROLLABLE_H__
-#define __GTK_SCROLLABLE_H__
-
#include <gtk/gtkenums.h>
#include <gtk/gtktypes.h>
diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h
index 51fee713df..0050939006 100644
--- a/gtk/gtkscrollbar.h
+++ b/gtk/gtkscrollbar.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_SCROLLBAR_H__
#define __GTK_SCROLLBAR_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkrange.h>
diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index 780f1981fc..c3fcc63e8d 100644
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_SCROLLED_WINDOW_H__
+#define __GTK_SCROLLED_WINDOW_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_SCROLLED_WINDOW_H__
-#define __GTK_SCROLLED_WINDOW_H__
-
#include <gtk/gtkbin.h>
G_BEGIN_DECLS
diff --git a/gtk/gtksearchentry.h b/gtk/gtksearchentry.h
index a861219bdf..7f274ba014 100644
--- a/gtk/gtksearchentry.h
+++ b/gtk/gtksearchentry.h
@@ -25,13 +25,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_SEARCH_ENTRY_H__
+#define __GTK_SEARCH_ENTRY_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_SEARCH_ENTRY_H__
-#define __GTK_SEARCH_ENTRY_H__
-
#include <gtk/gtkentry.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index a86a1ca73d..66f39ff9dd 100644
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_SELECTION_H__
+#define __GTK_SELECTION_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_SELECTION_H__
-#define __GTK_SELECTION_H__
-
#include <gtk/gtkwidget.h>
#include <gtk/gtktextiter.h>
diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h
index dacb6c46f9..4a9b63a34b 100644
--- a/gtk/gtkseparator.h
+++ b/gtk/gtkseparator.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_SEPARATOR_H__
#define __GTK_SEPARATOR_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkwidget.h>
diff --git a/gtk/gtkseparatormenuitem.h b/gtk/gtkseparatormenuitem.h
index f475a7969c..f2bb03f76d 100644
--- a/gtk/gtkseparatormenuitem.h
+++ b/gtk/gtkseparatormenuitem.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_SEPARATOR_MENU_ITEM_H__
#define __GTK_SEPARATOR_MENU_ITEM_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkmenuitem.h>
diff --git a/gtk/gtkseparatortoolitem.h b/gtk/gtkseparatortoolitem.h
index 2e57141fff..1a941f75bf 100644
--- a/gtk/gtkseparatortoolitem.h
+++ b/gtk/gtkseparatortoolitem.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_SEPARATOR_TOOL_ITEM_H__
+#define __GTK_SEPARATOR_TOOL_ITEM_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_SEPARATOR_TOOL_ITEM_H__
-#define __GTK_SEPARATOR_TOOL_ITEM_H__
-
#include <gtk/gtktoolitem.h>
G_BEGIN_DECLS
diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h
index 4a33093377..9e6434a12e 100644
--- a/gtk/gtksettings.h
+++ b/gtk/gtksettings.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_SETTINGS_H__
+#define __GTK_SETTINGS_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_SETTINGS_H__
-#define __GTK_SETTINGS_H__
-
#include <gdk/gdk.h>
#include <gtk/gtktypes.h>
diff --git a/gtk/gtkshow.h b/gtk/gtkshow.h
index b52f2c6977..339270a835 100644
--- a/gtk/gtkshow.h
+++ b/gtk/gtkshow.h
@@ -18,13 +18,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_SHOW_H__
+#define __GTK_SHOW_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_SHOW_H__
-#define __GTK_SHOW_H__
-
G_BEGIN_DECLS
gboolean gtk_show_uri (GdkScreen *screen,
diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h
index 3322c0ac76..9e1462222b 100644
--- a/gtk/gtksizegroup.h
+++ b/gtk/gtksizegroup.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_SIZE_GROUP_H__
+#define __GTK_SIZE_GROUP_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_SIZE_GROUP_H__
-#define __GTK_SIZE_GROUP_H__
-
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index b5ae4e9337..65f52e013c 100644
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_SOCKET_H__
+#define __GTK_SOCKET_H__
+
#if !defined (__GTKX_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtkx.h> can be included directly."
#endif
-#ifndef __GTK_SOCKET_H__
-#define __GTK_SOCKET_H__
-
#include <gtk/gtk.h>
#ifdef GDK_WINDOWING_X11
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index 362c4d56b4..7ed63529ad 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -25,14 +25,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_SPIN_BUTTON_H__
#define __GTK_SPIN_BUTTON_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkentry.h>
diff --git a/gtk/gtkspinner.h b/gtk/gtkspinner.h
index 1e592b2a04..ef5ff0d4f8 100644
--- a/gtk/gtkspinner.h
+++ b/gtk/gtkspinner.h
@@ -20,13 +20,13 @@
* by Christian Hergert <christian.hergert@gmail.com>
*/
+#ifndef __GTK_SPINNER_H__
+#define __GTK_SPINNER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_SPINNER_H__
-#define __GTK_SPINNER_H__
-
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h
index adcbb2d88f..af018b6960 100644
--- a/gtk/gtkstatusbar.h
+++ b/gtk/gtkstatusbar.h
@@ -23,13 +23,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_STATUSBAR_H__
+#define __GTK_STATUSBAR_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_STATUSBAR_H__
-#define __GTK_STATUSBAR_H__
-
#include <gtk/gtkbox.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h
index e819aa7b0d..36de4e67df 100644
--- a/gtk/gtkstatusicon.h
+++ b/gtk/gtkstatusicon.h
@@ -19,13 +19,13 @@
* Mark McLoughlin <mark@skynet.ie>
*/
+#ifndef __GTK_STATUS_ICON_H__
+#define __GTK_STATUS_ICON_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_STATUS_ICON_H__
-#define __GTK_STATUS_ICON_H__
-
#include <gtk/gtkimage.h>
#include <gtk/gtkmenu.h>
diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h
index ff4097973b..0c60f6727a 100644
--- a/gtk/gtkstock.h
+++ b/gtk/gtkstock.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_STOCK_H__
#define __GTK_STOCK_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h
index 99d0d7418d..dab758a5fb 100644
--- a/gtk/gtkstylecontext.h
+++ b/gtk/gtkstylecontext.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_STYLE_CONTEXT_H__
+#define __GTK_STYLE_CONTEXT_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_STYLE_CONTEXT_H__
-#define __GTK_STYLE_CONTEXT_H__
-
#include <gtk/gtkborder.h>
#include <gtk/gtkcsssection.h>
#include <gtk/gtkstyleprovider.h>
diff --git a/gtk/gtkstyleproperties.h b/gtk/gtkstyleproperties.h
index 7237361e2d..fd81699678 100644
--- a/gtk/gtkstyleproperties.h
+++ b/gtk/gtkstyleproperties.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_STYLE_PROPERTIES_H__
+#define __GTK_STYLE_PROPERTIES_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_STYLE_PROPERTIES_H__
-#define __GTK_STYLE_PROPERTIES_H__
-
#include <glib-object.h>
#include <gdk/gdk.h>
#include <gtk/gtkenums.h>
diff --git a/gtk/gtkstyleprovider.h b/gtk/gtkstyleprovider.h
index 56fa141eaa..81bf5d6a60 100644
--- a/gtk/gtkstyleprovider.h
+++ b/gtk/gtkstyleprovider.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_STYLE_PROVIDER_H__
+#define __GTK_STYLE_PROVIDER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_STYLE_PROVIDER_H__
-#define __GTK_STYLE_PROVIDER_H__
-
#include <glib-object.h>
#include <gtk/gtkenums.h>
#include <gtk/gtkiconfactory.h>
diff --git a/gtk/gtkswitch.h b/gtk/gtkswitch.h
index d288cc2a5b..1f7ed4c0df 100644
--- a/gtk/gtkswitch.h
+++ b/gtk/gtkswitch.h
@@ -23,13 +23,13 @@
* Based on similar code from Mx.
*/
+#ifndef __GTK_SWITCH_H__
+#define __GTK_SWITCH_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_SWITCH_H__
-#define __GTK_SWITCH_H__
-
#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
diff --git a/gtk/gtktestutils.h b/gtk/gtktestutils.h
index 207fefd43b..c27decf2b2 100644
--- a/gtk/gtktestutils.h
+++ b/gtk/gtktestutils.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TEST_UTILS_H__
+#define __GTK_TEST_UTILS_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TEST_UTILS_H__
-#define __GTK_TEST_UTILS_H__
-
#include <gtk/gtkwidget.h>
#include <gtk/gtkspinbutton.h>
diff --git a/gtk/gtktextattributes.h b/gtk/gtktextattributes.h
index d07a2eee57..521ac00703 100644
--- a/gtk/gtktextattributes.h
+++ b/gtk/gtktextattributes.h
@@ -47,14 +47,14 @@
*
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#ifndef __GTK_TEXT_ATTRIBUTES_H__
#define __GTK_TEXT_ATTRIBUTES_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>
diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index 92551555ed..793b7635ac 100644
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_TEXT_BUFFER_H__
+#define __GTK_TEXT_BUFFER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TEXT_BUFFER_H__
-#define __GTK_TEXT_BUFFER_H__
-
#include <gtk/gtkwidget.h>
#include <gtk/gtkclipboard.h>
#include <gtk/gtktexttagtable.h>
diff --git a/gtk/gtktextbufferrichtext.h b/gtk/gtktextbufferrichtext.h
index 4dec3f306f..44034dffb9 100644
--- a/gtk/gtktextbufferrichtext.h
+++ b/gtk/gtktextbufferrichtext.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TEXT_BUFFER_RICH_TEXT_H__
+#define __GTK_TEXT_BUFFER_RICH_TEXT_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TEXT_BUFFER_RICH_TEXT_H__
-#define __GTK_TEXT_BUFFER_RICH_TEXT_H__
-
#include <gtk/gtktextbuffer.h>
G_BEGIN_DECLS
diff --git a/gtk/gtktextchild.h b/gtk/gtktextchild.h
index 6884432f8e..2aa859a916 100644
--- a/gtk/gtktextchild.h
+++ b/gtk/gtktextchild.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_TEXT_CHILD_H__
+#define __GTK_TEXT_CHILD_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TEXT_CHILD_H__
-#define __GTK_TEXT_CHILD_H__
-
#include <gdk/gdk.h>
#include <glib-object.h>
diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index 723ce52459..5fb99123ef 100644
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_TEXT_ITER_H__
+#define __GTK_TEXT_ITER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TEXT_ITER_H__
-#define __GTK_TEXT_ITER_H__
-
#include <gtk/gtktextattributes.h>
#include <gtk/gtktextchild.h>
#include <gtk/gtktexttag.h>
diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h
index 3e45d3cd40..a68a3aeb15 100644
--- a/gtk/gtktextmark.h
+++ b/gtk/gtktextmark.h
@@ -47,13 +47,13 @@
*
*/
+#ifndef __GTK_TEXT_MARK_H__
+#define __GTK_TEXT_MARK_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TEXT_MARK_H__
-#define __GTK_TEXT_MARK_H__
-
G_BEGIN_DECLS
typedef struct _GtkTextMark GtkTextMark;
diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index 1286b37dd9..6c7992458c 100644
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -47,14 +47,14 @@
*
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#ifndef __GTK_TEXT_TAG_H__
#define __GTK_TEXT_TAG_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>
diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h
index 1ea04ee680..3a42e67ebc 100644
--- a/gtk/gtktexttagtable.h
+++ b/gtk/gtktexttagtable.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_TEXT_TAG_TABLE_H__
+#define __GTK_TEXT_TAG_TABLE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TEXT_TAG_TABLE_H__
-#define __GTK_TEXT_TAG_TABLE_H__
-
#include <gtk/gtktexttag.h>
G_BEGIN_DECLS
diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h
index 03a17edd1d..2b81b4f6c5 100644
--- a/gtk/gtktextview.h
+++ b/gtk/gtktextview.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_TEXT_VIEW_H__
+#define __GTK_TEXT_VIEW_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TEXT_VIEW_H__
-#define __GTK_TEXT_VIEW_H__
-
#include <gtk/gtkcontainer.h>
#include <gtk/gtkimcontext.h>
#include <gtk/gtktextbuffer.h>
diff --git a/gtk/gtkthemingengine.h b/gtk/gtkthemingengine.h
index 78768386f5..be458bbb76 100644
--- a/gtk/gtkthemingengine.h
+++ b/gtk/gtkthemingengine.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_THEMING_ENGINE_H__
+#define __GTK_THEMING_ENGINE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_THEMING_ENGINE_H__
-#define __GTK_THEMING_ENGINE_H__
-
#include <glib-object.h>
#include <cairo.h>
diff --git a/gtk/gtktoggleaction.h b/gtk/gtktoggleaction.h
index a9af96f194..4803594ef7 100644
--- a/gtk/gtktoggleaction.h
+++ b/gtk/gtktoggleaction.h
@@ -26,13 +26,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_TOGGLE_ACTION_H__
+#define __GTK_TOGGLE_ACTION_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TOGGLE_ACTION_H__
-#define __GTK_TOGGLE_ACTION_H__
-
#include <gtk/gtkaction.h>
G_BEGIN_DECLS
diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h
index 3d6c5163b7..1183c9bfc2 100644
--- a/gtk/gtktogglebutton.h
+++ b/gtk/gtktogglebutton.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_TOGGLE_BUTTON_H__
#define __GTK_TOGGLE_BUTTON_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkbutton.h>
diff --git a/gtk/gtktoggletoolbutton.h b/gtk/gtktoggletoolbutton.h
index 0ef029cda5..13368e97c5 100644
--- a/gtk/gtktoggletoolbutton.h
+++ b/gtk/gtktoggletoolbutton.h
@@ -18,13 +18,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TOGGLE_TOOL_BUTTON_H__
+#define __GTK_TOGGLE_TOOL_BUTTON_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TOGGLE_TOOL_BUTTON_H__
-#define __GTK_TOGGLE_TOOL_BUTTON_H__
-
#include <gtk/gtktoolbutton.h>
G_BEGIN_DECLS
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index ce5186a7fc..deb50e4fff 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -27,14 +27,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_TOOLBAR_H__
#define __GTK_TOOLBAR_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkcontainer.h>
#include <gtk/gtktoolitem.h>
diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h
index e9d37348d6..144607fbb6 100644
--- a/gtk/gtktoolbutton.h
+++ b/gtk/gtktoolbutton.h
@@ -18,13 +18,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TOOL_BUTTON_H__
+#define __GTK_TOOL_BUTTON_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TOOL_BUTTON_H__
-#define __GTK_TOOL_BUTTON_H__
-
#include <gtk/gtktoolitem.h>
G_BEGIN_DECLS
diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h
index 3a706b26fe..1a623916f5 100644
--- a/gtk/gtktoolitem.h
+++ b/gtk/gtktoolitem.h
@@ -18,13 +18,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TOOL_ITEM_H__
+#define __GTK_TOOL_ITEM_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TOOL_ITEM_H__
-#define __GTK_TOOL_ITEM_H__
-
#include <gtk/gtkbin.h>
#include <gtk/gtkmenuitem.h>
#include <gtk/gtksizegroup.h>
diff --git a/gtk/gtktoolitemgroup.h b/gtk/gtktoolitemgroup.h
index 350728ef87..c61b282a07 100644
--- a/gtk/gtktoolitemgroup.h
+++ b/gtk/gtktoolitemgroup.h
@@ -18,13 +18,13 @@
* Mathias Hasselmann
*/
+#ifndef __GTK_TOOL_ITEM_GROUP_H__
+#define __GTK_TOOL_ITEM_GROUP_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TOOL_ITEM_GROUP_H__
-#define __GTK_TOOL_ITEM_GROUP_H__
-
#include <gtk/gtkcontainer.h>
#include <gtk/gtktoolitem.h>
diff --git a/gtk/gtktoolpalette.h b/gtk/gtktoolpalette.h
index 88e2b01530..8b05547c83 100644
--- a/gtk/gtktoolpalette.h
+++ b/gtk/gtktoolpalette.h
@@ -18,13 +18,13 @@
* Mathias Hasselmann
*/
+#ifndef __GTK_TOOL_PALETTE_H__
+#define __GTK_TOOL_PALETTE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TOOL_PALETTE_H__
-#define __GTK_TOOL_PALETTE_H__
-
#include <gtk/gtkcontainer.h>
#include <gtk/gtkdnd.h>
#include <gtk/gtktoolitem.h>
diff --git a/gtk/gtktoolshell.h b/gtk/gtktoolshell.h
index effa1714ef..8cca4eb350 100644
--- a/gtk/gtktoolshell.h
+++ b/gtk/gtktoolshell.h
@@ -18,14 +18,14 @@
* Mathias Hasselmann
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#ifndef __GTK_TOOL_SHELL_H__
#define __GTK_TOOL_SHELL_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkenums.h>
#include <pango/pango.h>
#include <gtk/gtksizegroup.h>
diff --git a/gtk/gtktooltip.h b/gtk/gtktooltip.h
index ab8f3eb5f0..daa4a3e69f 100644
--- a/gtk/gtktooltip.h
+++ b/gtk/gtktooltip.h
@@ -17,13 +17,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TOOLTIP_H__
+#define __GTK_TOOLTIP_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TOOLTIP_H__
-#define __GTK_TOOLTIP_H__
-
#include <gtk/gtkwindow.h>
G_BEGIN_DECLS
diff --git a/gtk/gtktreednd.h b/gtk/gtktreednd.h
index 98ba6182df..934d003a64 100644
--- a/gtk/gtktreednd.h
+++ b/gtk/gtktreednd.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TREE_DND_H__
+#define __GTK_TREE_DND_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TREE_DND_H__
-#define __GTK_TREE_DND_H__
-
#include <gtk/gtktreemodel.h>
#include <gtk/gtkdnd.h>
diff --git a/gtk/gtktreemenu.h b/gtk/gtktreemenu.h
index 702051fdbd..674ce01e70 100644
--- a/gtk/gtktreemenu.h
+++ b/gtk/gtktreemenu.h
@@ -19,13 +19,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TREE_MENU_H__
+#define __GTK_TREE_MENU_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TREE_MENU_H__
-#define __GTK_TREE_MENU_H__
-
#include <gtk/gtkmenu.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreeview.h>
diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h
index 7d082f1dea..fed9850b3e 100644
--- a/gtk/gtktreemodel.h
+++ b/gtk/gtktreemodel.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TREE_MODEL_H__
+#define __GTK_TREE_MODEL_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TREE_MODEL_H__
-#define __GTK_TREE_MODEL_H__
-
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h
index b3e0c005fb..832de50698 100644
--- a/gtk/gtktreemodelfilter.h
+++ b/gtk/gtktreemodelfilter.h
@@ -16,13 +16,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TREE_MODEL_FILTER_H__
+#define __GTK_TREE_MODEL_FILTER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TREE_MODEL_FILTER_H__
-#define __GTK_TREE_MODEL_FILTER_H__
-
#include <gtk/gtktreemodel.h>
G_BEGIN_DECLS
diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index 7ac5e55fd9..9ba6d1f38a 100644
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TREE_MODEL_SORT_H__
+#define __GTK_TREE_MODEL_SORT_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TREE_MODEL_SORT_H__
-#define __GTK_TREE_MODEL_SORT_H__
-
#include <gdk/gdk.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreesortable.h>
diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index 0b99f335bb..4600930ce7 100644
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TREE_SELECTION_H__
+#define __GTK_TREE_SELECTION_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TREE_SELECTION_H__
-#define __GTK_TREE_SELECTION_H__
-
#include <gtk/gtktreeview.h>
G_BEGIN_DECLS
diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h
index 1d46388665..1023a17106 100644
--- a/gtk/gtktreesortable.h
+++ b/gtk/gtktreesortable.h
@@ -15,14 +15,14 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
#ifndef __GTK_TREE_SORTABLE_H__
#define __GTK_TREE_SORTABLE_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkenums.h>
#include <gtk/gtktreemodel.h>
diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index 9ea6d3ad24..69a42bee1b 100644
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TREE_STORE_H__
+#define __GTK_TREE_STORE_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TREE_STORE_H__
-#define __GTK_TREE_STORE_H__
-
#include <gdk/gdk.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreesortable.h>
diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index 8bab0664f8..277d19acf0 100644
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TREE_VIEW_H__
+#define __GTK_TREE_VIEW_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TREE_VIEW_H__
-#define __GTK_TREE_VIEW_H__
-
#include <gtk/gtkcontainer.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreeviewcolumn.h>
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 6666909eae..47cea71436 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_TREE_VIEW_COLUMN_H__
+#define __GTK_TREE_VIEW_COLUMN_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TREE_VIEW_COLUMN_H__
-#define __GTK_TREE_VIEW_COLUMN_H__
-
#include <gtk/gtkcellrenderer.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreesortable.h>
diff --git a/gtk/gtktypes.h b/gtk/gtktypes.h
index b3eade30a5..ed93bc537f 100644
--- a/gtk/gtktypes.h
+++ b/gtk/gtktypes.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_TYPES_H__
+#define __GTK_TYPES_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_TYPES_H__
-#define __GTK_TYPES_H__
-
G_BEGIN_DECLS
typedef struct _GtkAdjustment GtkAdjustment;
diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h
index 181cfa50d4..85f945affd 100644
--- a/gtk/gtkuimanager.h
+++ b/gtk/gtkuimanager.h
@@ -26,13 +26,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_UI_MANAGER_H__
+#define __GTK_UI_MANAGER_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_UI_MANAGER_H__
-#define __GTK_UI_MANAGER_H__
-
#include <gtk/gtkaccelgroup.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkaction.h>
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index 68aaa857b6..cd09357991 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.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_VIEWPORT_H__
#define __GTK_VIEWPORT_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkbin.h>
diff --git a/gtk/gtkvolumebutton.h b/gtk/gtkvolumebutton.h
index 6c4cc21a1d..74a1ca6d39 100644
--- a/gtk/gtkvolumebutton.h
+++ b/gtk/gtkvolumebutton.h
@@ -25,13 +25,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_VOLUME_BUTTON_H__
+#define __GTK_VOLUME_BUTTON_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_VOLUME_BUTTON_H__
-#define __GTK_VOLUME_BUTTON_H__
-
#include <gtk/gtkscalebutton.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 2cdc7f3e6f..0f1638f69b 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -22,13 +22,13 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#ifndef __GTK_WIDGET_H__
+#define __GTK_WIDGET_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_WIDGET_H__
-#define __GTK_WIDGET_H__
-
#include <gdk/gdk.h>
#include <gtk/gtkaccelgroup.h>
#include <gtk/gtkborder.h>
diff --git a/gtk/gtkwidgetpath.h b/gtk/gtkwidgetpath.h
index 4c2c674ce7..73bf7c0e19 100644
--- a/gtk/gtkwidgetpath.h
+++ b/gtk/gtkwidgetpath.h
@@ -15,13 +15,13 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef __GTK_WIDGET_PATH_H__
+#define __GTK_WIDGET_PATH_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#ifndef __GTK_WIDGET_PATH_H__
-#define __GTK_WIDGET_PATH_H__
-
#include <glib-object.h>
#include <gdk/gdk.h>
#include <gtk/gtkenums.h>
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 0f8491e674..22197b2312 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.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_WINDOW_H__
#define __GTK_WINDOW_H__
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#include <gtk/gtkapplication.h>
#include <gtk/gtkaccelgroup.h>
#include <gtk/gtkbin.h>