diff --git a/atk/atkaction.h b/atk/atkaction.h
index 68cb7a0..b970ffe 100755
--- 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 cf6dc9f..2af8be9 100755
--- 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 168a252..d190d68 100755
--- 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 da60bbd..bf2b3b6 100755
--- 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 13950ae..5f3c75a 100644
--- 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/atk.h>
 
 G_BEGIN_DECLS
diff --git a/atk/atkhyperlink.h b/atk/atkhyperlink.h
index 2e8a529..3cdff33 100755
--- 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 3e0f589..8e06a6c 100644
--- 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 d8328a8..635f3b9 100755
--- 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 1091d7c..f08684d 100755
--- 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 2fad4aa..d1a1ea3 100755
--- 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>
 
 /* We prefix variable declarations so they can
diff --git a/atk/atknoopobject.h b/atk/atknoopobject.h
index 261571c..e1c55b0 100644
--- a/atk/atknoopobject.h
+++ b/atk/atknoopobject.h
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __ATK_NO_OP_OBJECT_H__
+#define __ATK_NO_OP_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_NO_OP_OBJECT_H__
-#define __ATK_NO_OP_OBJECT_H__
-
 G_BEGIN_DECLS
 
 #define ATK_TYPE_NO_OP_OBJECT                (atk_no_op_object_get_type ())
diff --git a/atk/atknoopobjectfactory.h b/atk/atknoopobjectfactory.h
index b216d6c..008d82f 100755
--- 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 0fa91be..f3591b5 100755
--- 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/atkstate.h>
 #include <atk/atkrelationtype.h>
diff --git a/atk/atkobjectfactory.h b/atk/atkobjectfactory.h
index ff7e254..77db881 100755
--- 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 7d6efd4..fc270be 100644
--- 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__
-
 G_BEGIN_DECLS
 
 #define ATK_TYPE_PLUG               (atk_plug_get_type ())
diff --git a/atk/atkregistry.h b/atk/atkregistry.h
index eb16403..786f11e 100644
--- 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 5cccaee..d564c6d 100755
--- 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 2d97bf1..e919f73 100755
--- 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 c932e56..78403a1 100755
--- 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 9a0050f..467d71c 100755
--- 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 813d4f3..514a488 100644
--- 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__
-
 G_BEGIN_DECLS
 
 #define ATK_TYPE_SOCKET               (atk_socket_get_type ())
diff --git a/atk/atkstate.h b/atk/atkstate.h
index 16feb52..b58654e 100755
--- 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>
 
 G_BEGIN_DECLS
diff --git a/atk/atkstateset.h b/atk/atkstateset.h
index b592eb5..fb1c964 100755
--- 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 54d832b..5d1221e 100755
--- 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 e8d5075..19397b8 100755
--- 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/atktext.h b/atk/atktext.h
index 0edfcc0..182998a 100755
--- 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 ce7e21d..d148011 100755
--- 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 276b679..7728fbf 100755
--- 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>
 
 G_BEGIN_DECLS
diff --git a/atk/atkwindow.h b/atk/atkwindow.h
index 7d14913..0f87d89 100644
--- 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
