Move include guards out to enable GCC optimisation

by ensuring the #ifndef GUARD_NAME and its #endif are the outermost
pieces of non-comment and non-whitespace content in the header file.

https://bugzilla.gnome.org/show_bug.cgi?id=689810

diff --git a/atk/atkaction.h b/atk/atkaction.h
index 3712806..1314071 100644 (file)
--- a/atk/atkaction.h
+++ b/atk/atkaction.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_ACTION_H__
+#define __ATK_ACTION_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_ACTION_H__
-#define __ATK_ACTION_H__
-
 #include <atk/atkobject.h>
 
 G_BEGIN_DECLS

diff --git a/atk/atkcomponent.h b/atk/atkcomponent.h
index 9cc85ee..d20fdc2 100644 (file)
--- a/atk/atkcomponent.h
+++ b/atk/atkcomponent.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_COMPONENT_H__
+#define __ATK_COMPONENT_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_COMPONENT_H__
-#define __ATK_COMPONENT_H__
-
 #include <atk/atkobject.h>
 #include <atk/atkutil.h>
 

diff --git a/atk/atkdocument.h b/atk/atkdocument.h
index aa38d3e..0aed668 100644 (file)
--- a/atk/atkdocument.h
+++ b/atk/atkdocument.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_DOCUMENT_H__
+#define __ATK_DOCUMENT_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_DOCUMENT_H__
-#define __ATK_DOCUMENT_H__
-
 #include <atk/atkobject.h>
 #include <atk/atkutil.h>
 

diff --git a/atk/atkeditabletext.h b/atk/atkeditabletext.h
index f78f267..3eebab2 100644 (file)
--- a/atk/atkeditabletext.h
+++ b/atk/atkeditabletext.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_EDITABLE_TEXT_H__
+#define __ATK_EDITABLE_TEXT_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_EDITABLE_TEXT_H__
-#define __ATK_EDITABLE_TEXT_H__
-
 #include <atk/atkobject.h>
 #include <atk/atktext.h>
 

diff --git a/atk/atkgobjectaccessible.h b/atk/atkgobjectaccessible.h
index f843370..38066e5 100644 (file)
--- a/atk/atkgobjectaccessible.h
+++ b/atk/atkgobjectaccessible.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_GOBJECT_ACCESSIBLE_H__
+#define __ATK_GOBJECT_ACCESSIBLE_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_GOBJECT_ACCESSIBLE_H__
-#define __ATK_GOBJECT_ACCESSIBLE_H__
-
 #include <atk/atkobject.h>
 
 G_BEGIN_DECLS

diff --git a/atk/atkhyperlink.h b/atk/atkhyperlink.h
index 6e8dc74..915118c 100644 (file)
--- a/atk/atkhyperlink.h
+++ b/atk/atkhyperlink.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_HYPERLINK_H__
+#define __ATK_HYPERLINK_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_HYPERLINK_H__
-#define __ATK_HYPERLINK_H__
-
 #include <atk/atkaction.h>
 
 G_BEGIN_DECLS

diff --git a/atk/atkhyperlinkimpl.h b/atk/atkhyperlinkimpl.h
index 65568b5..3b78fcc 100644 (file)
--- a/atk/atkhyperlinkimpl.h
+++ b/atk/atkhyperlinkimpl.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_HYPERLINK_IMPL_H__
+#define __ATK_HYPERLINK_IMPL_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_HYPERLINK_IMPL_H__
-#define __ATK_HYPERLINK_IMPL_H__
-
 #include <atk/atkobject.h>
 #include <atk/atkhyperlink.h>
 

diff --git a/atk/atkhypertext.h b/atk/atkhypertext.h
index 6a97215..6a1ef9a 100644 (file)
--- a/atk/atkhypertext.h
+++ b/atk/atkhypertext.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_HYPERTEXT_H__
+#define __ATK_HYPERTEXT_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_HYPERTEXT_H__
-#define __ATK_HYPERTEXT_H__
-
 #include <atk/atkobject.h>
 #include <atk/atkhyperlink.h>
 

diff --git a/atk/atkimage.h b/atk/atkimage.h
index 4905cd1..f4b430c 100644 (file)
--- a/atk/atkimage.h
+++ b/atk/atkimage.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_IMAGE_H__
+#define __ATK_IMAGE_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_IMAGE_H__
-#define __ATK_IMAGE_H__
-
 #include <atk/atkobject.h>
 #include <atk/atkutil.h>
 

diff --git a/atk/atkmisc.h b/atk/atkmisc.h
index e898e35..0707b04 100644 (file)
--- a/atk/atkmisc.h
+++ b/atk/atkmisc.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_MISC_H__
+#define __ATK_MISC_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_MISC_H__
-#define __ATK_MISC_H__
-
 #include <glib-object.h>
 #include <atk/atkversion.h>
 

diff --git a/atk/atknoopobjectfactory.h b/atk/atknoopobjectfactory.h
index 953e8fe..2cd69f4 100644 (file)
--- a/atk/atknoopobjectfactory.h
+++ b/atk/atknoopobjectfactory.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_NO_OP_OBJECT_FACTORY_H__
+#define __ATK_NO_OP_OBJECT_FACTORY_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_NO_OP_OBJECT_FACTORY_H__
-#define __ATK_NO_OP_OBJECT_FACTORY_H__
-
 #include <atk/atkobjectfactory.h>
 
 G_BEGIN_DECLS

diff --git a/atk/atkobject.h b/atk/atkobject.h
index 552f1c5..8a8aafc 100644 (file)
--- a/atk/atkobject.h
+++ b/atk/atkobject.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_OBJECT_H__
+#define __ATK_OBJECT_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_OBJECT_H__
-#define __ATK_OBJECT_H__
-
 #include <glib-object.h>
 
 #include <atk/atkversion.h>

diff --git a/atk/atkobjectfactory.h b/atk/atkobjectfactory.h
index 4c9cb10..75594f9 100644 (file)
--- a/atk/atkobjectfactory.h
+++ b/atk/atkobjectfactory.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_OBJECT_FACTORY_H__
+#define __ATK_OBJECT_FACTORY_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_OBJECT_FACTORY_H__
-#define __ATK_OBJECT_FACTORY_H__
-
 #include <glib-object.h>
 #include <atk/atkobject.h>
 

diff --git a/atk/atkplug.h b/atk/atkplug.h
index 1e6813f..b1d83ff 100644 (file)
--- a/atk/atkplug.h
+++ b/atk/atkplug.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_PLUG_H__
+#define __ATK_PLUG_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_PLUG_H__
-#define __ATK_PLUG_H__
-
 #include <atk/atkversion.h>
 
 G_BEGIN_DECLS

diff --git a/atk/atkprivate.h b/atk/atkprivate.h
index 3d33c90..0c6f484 100644 (file)
--- a/atk/atkprivate.h
+++ b/atk/atkprivate.h
@@ -19,13 +19,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_PRIVATE_H__
+#define __ATK_PRIVATE_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_PRIVATE_H__
-#define __ATK_PRIVATE_H__
-
 G_BEGIN_DECLS
 
 void      _gettext_initialization (void);

diff --git a/atk/atkrange.h b/atk/atkrange.h
index 0dd585c..6a5eeef 100644 (file)
--- a/atk/atkrange.h
+++ b/atk/atkrange.h
@@ -18,13 +18,13 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifndef __ATK_RANGE_H__
+#define __ATK_RANGE_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_RANGE_H__
-#define __ATK_RANGE_H__
-
 #include <glib-object.h>
 #include <atk/atkversion.h>
 

diff --git a/atk/atkregistry.h b/atk/atkregistry.h
index 2490940..dff508a 100644 (file)
--- a/atk/atkregistry.h
+++ b/atk/atkregistry.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_REGISTRY_H__
+#define __ATK_REGISTRY_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_REGISTRY_H__
-#define __ATK_REGISTRY_H__
-
 #include <glib-object.h>
 #include "atkobjectfactory.h"
 

diff --git a/atk/atkrelation.h b/atk/atkrelation.h
index 0c958fa..a3f93a1 100644 (file)
--- a/atk/atkrelation.h
+++ b/atk/atkrelation.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_RELATION_H__
+#define __ATK_RELATION_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_RELATION_H__
-#define __ATK_RELATION_H__
-
 G_BEGIN_DECLS
 
 #include <glib-object.h>

diff --git a/atk/atkrelationset.h b/atk/atkrelationset.h
index ed286b4..c84980a 100644 (file)
--- a/atk/atkrelationset.h
+++ b/atk/atkrelationset.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_RELATION_SET_H__
+#define __ATK_RELATION_SET_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_RELATION_SET_H__
-#define __ATK_RELATION_SET_H__
-
 G_BEGIN_DECLS
 
 #include <glib-object.h>

diff --git a/atk/atkrelationtype.h b/atk/atkrelationtype.h
index d1c7410..da785a7 100644 (file)
--- a/atk/atkrelationtype.h
+++ b/atk/atkrelationtype.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_RELATION_TYPE_H__
+#define __ATK_RELATION_TYPE_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_RELATION_TYPE_H__
-#define __ATK_RELATION_TYPE_H__
-
 #include <glib.h>
 
 G_BEGIN_DECLS

diff --git a/atk/atkselection.h b/atk/atkselection.h
index 0d51cf2..df508bf 100644 (file)
--- a/atk/atkselection.h
+++ b/atk/atkselection.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_SELECTION_H__
+#define __ATK_SELECTION_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_SELECTION_H__
-#define __ATK_SELECTION_H__
-
 #include <atk/atkobject.h>
 
 G_BEGIN_DECLS

diff --git a/atk/atksocket.h b/atk/atksocket.h
index 600559b..54a98af 100644 (file)
--- a/atk/atksocket.h
+++ b/atk/atksocket.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_SOCKET_H__
+#define __ATK_SOCKET_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_SOCKET_H__
-#define __ATK_SOCKET_H__
-
 #include <atk/atkversion.h>
 
 G_BEGIN_DECLS

diff --git a/atk/atkstate.h b/atk/atkstate.h
index 06b67c8..6a88567 100644 (file)
--- a/atk/atkstate.h
+++ b/atk/atkstate.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_STATE_H__
+#define __ATK_STATE_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_STATE_H__
-#define __ATK_STATE_H__
-
 #include <glib-object.h>
 #include <atk/atkversion.h>
 

diff --git a/atk/atkstateset.h b/atk/atkstateset.h
index e67679e..bcb8946 100644 (file)
--- a/atk/atkstateset.h
+++ b/atk/atkstateset.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_STATE_SET_H__
+#define __ATK_STATE_SET_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_STATE_SET_H__
-#define __ATK_STATE_SET_H__
-
 #include <glib-object.h>
 #include <atk/atkobject.h>
 #include <atk/atkstate.h>

diff --git a/atk/atkstreamablecontent.h b/atk/atkstreamablecontent.h
index 91d09c1..a43d1b9 100644 (file)
--- a/atk/atkstreamablecontent.h
+++ b/atk/atkstreamablecontent.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_STREAMABLE_CONTENT_H__
+#define __ATK_STREAMABLE_CONTENT_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_STREAMABLE_CONTENT_H__
-#define __ATK_STREAMABLE_CONTENT_H__
-
 #include <atk/atkobject.h>
 
 G_BEGIN_DECLS

diff --git a/atk/atktable.h b/atk/atktable.h
index 388f1b8..19b48ab 100644 (file)
--- a/atk/atktable.h
+++ b/atk/atktable.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_TABLE_H__
+#define __ATK_TABLE_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_TABLE_H__
-#define __ATK_TABLE_H__
-
 #include <atk/atkobject.h>
 
 G_BEGIN_DECLS

diff --git a/atk/atktablecell.h b/atk/atktablecell.h
index 0e70d69..53d0dd7 100644 (file)
--- a/atk/atktablecell.h
+++ b/atk/atktablecell.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_TABLE_CELL_H__
+#define __ATK_TABLE_CELL_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_TABLE_CELL_H__
-#define __ATK_TABLE_CELL_H__
-
 #include <atk/atkobject.h>
 
 G_BEGIN_DECLS

diff --git a/atk/atktext.h b/atk/atktext.h
index d6b4085..d8852e4 100644 (file)
--- a/atk/atktext.h
+++ b/atk/atktext.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_TEXT_H__
+#define __ATK_TEXT_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_TEXT_H__
-#define __ATK_TEXT_H__
-
 #include <glib-object.h>
 #include <atk/atkobject.h>
 #include <atk/atkutil.h>

diff --git a/atk/atkutil.h b/atk/atkutil.h
index 79180e2..d69df88 100644 (file)
--- a/atk/atkutil.h
+++ b/atk/atkutil.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_UTIL_H__
+#define __ATK_UTIL_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_UTIL_H__
-#define __ATK_UTIL_H__
-
 #include <atk/atkobject.h>
 
 G_BEGIN_DECLS

diff --git a/atk/atkvalue.h b/atk/atkvalue.h
index bafbed4..d3e3ad5 100644 (file)
--- a/atk/atkvalue.h
+++ b/atk/atkvalue.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_VALUE_H__
+#define __ATK_VALUE_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_VALUE_H__
-#define __ATK_VALUE_H__
-
 #include <atk/atkobject.h>
 #include <atk/atkrange.h>
 

diff --git a/atk/atkwindow.h b/atk/atkwindow.h
index a9a5b4b..36d7fbb 100644 (file)
--- a/atk/atkwindow.h
+++ b/atk/atkwindow.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_WINDOW_H__
+#define __ATK_WINDOW_H__
+
 #if defined(ATK_DISABLE_SINGLE_INCLUDES) && !defined (__ATK_H_INSIDE__) && !defined (ATK_COMPILATION)
 #error "Only <atk/atk.h> can be included directly."
 #endif
 
-#ifndef __ATK_WINDOW_H__
-#define __ATK_WINDOW_H__
-
 #include <atk/atkobject.h>
 
 G_BEGIN_DECLS