[clutter] Move header inclusion guard at the top

[Emmanuele Bassi <ebassi src gnome org>]

commit 02b69e4d76f7f94f8faa964ebca2d01df7aaa8cf
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Jul 7 15:51:13 2015 +0100

    Move header inclusion guard at the top
    
    GCC has some optimization for the inclusion guard, but they only work if
    the check is the outermost one.
    
    We're fairly inconsistent because of historical reasons, so we should
    ensure that we follow the same pattern in every public header.

 clutter/clutter-action.h                     |    6 +++---
 clutter/clutter-actor-meta.h                 |    6 +++---
 clutter/clutter-actor.h                      |    6 +++---
 clutter/clutter-align-constraint.h           |    6 +++---
 clutter/clutter-backend.h                    |    6 +++---
 clutter/clutter-bin-layout.h                 |    6 +++---
 clutter/clutter-bind-constraint.h            |    6 +++---
 clutter/clutter-binding-pool.h               |    6 +++---
 clutter/clutter-blur-effect.h                |    6 +++---
 clutter/clutter-box-layout.h                 |    6 +++---
 clutter/clutter-brightness-contrast-effect.h |    6 +++---
 clutter/clutter-cairo.h                      |    6 +++---
 clutter/clutter-canvas.h                     |    6 +++---
 clutter/clutter-child-meta.h                 |    6 +++---
 clutter/clutter-click-action.h               |    6 +++---
 clutter/clutter-clone.h                      |    6 +++---
 clutter/clutter-color-static.h               |    6 +++---
 clutter/clutter-color.h                      |    6 +++---
 clutter/clutter-colorize-effect.h            |    6 +++---
 clutter/clutter-constraint.h                 |    6 +++---
 clutter/clutter-container.h                  |    6 +++---
 clutter/clutter-content.h                    |    6 +++---
 clutter/clutter-deform-effect.h              |    6 +++---
 clutter/clutter-desaturate-effect.h          |    6 +++---
 clutter/clutter-device-manager.h             |    6 +++---
 clutter/clutter-drag-action.h                |    6 +++---
 clutter/clutter-drop-action.h                |    6 +++---
 clutter/clutter-effect.h                     |    6 +++---
 clutter/clutter-enums.h                      |    6 +++---
 clutter/clutter-event.h                      |    6 +++---
 clutter/clutter-feature.h                    |    6 +++---
 clutter/clutter-fixed-layout.h               |    6 +++---
 clutter/clutter-flow-layout.h                |    6 +++---
 clutter/clutter-gesture-action.h             |    6 +++---
 clutter/clutter-grid-layout.h                |    6 +++---
 clutter/clutter-group.h                      |    6 +++---
 clutter/clutter-image.h                      |    6 +++---
 clutter/clutter-input-device.h               |    6 +++---
 clutter/clutter-interval.h                   |    6 +++---
 clutter/clutter-keyframe-transition.h        |    6 +++---
 clutter/clutter-layout-manager.h             |    6 +++---
 clutter/clutter-layout-meta.h                |    6 +++---
 clutter/clutter-macros.h                     |    6 +++---
 clutter/clutter-main.h                       |    6 +++---
 clutter/clutter-offscreen-effect.h           |    6 +++---
 clutter/clutter-page-turn-effect.h           |    6 +++---
 clutter/clutter-paint-node.h                 |    6 +++---
 clutter/clutter-paint-nodes.h                |    6 +++---
 clutter/clutter-pan-action.h                 |    6 +++---
 clutter/clutter-path-constraint.h            |    6 +++---
 clutter/clutter-path.h                       |    6 +++---
 clutter/clutter-property-transition.h        |    6 +++---
 clutter/clutter-rotate-action.h              |    6 +++---
 clutter/clutter-script.h                     |    6 +++---
 clutter/clutter-scriptable.h                 |    6 +++---
 clutter/clutter-scroll-actor.h               |    6 +++---
 clutter/clutter-settings.h                   |    6 +++---
 clutter/clutter-shader-effect.h              |    6 +++---
 clutter/clutter-shader-types.h               |    6 +++---
 clutter/clutter-snap-constraint.h            |    6 +++---
 clutter/clutter-stage-manager.h              |    6 +++---
 clutter/clutter-stage.h                      |    6 +++---
 clutter/clutter-tap-action.h                 |    6 +++---
 clutter/clutter-text-buffer.h                |    6 +++---
 clutter/clutter-text.h                       |    6 +++---
 clutter/clutter-transition-group.h           |    4 ++++
 clutter/clutter-transition.h                 |    6 +++---
 clutter/clutter-types.h                      |    6 +++---
 clutter/clutter-units.h                      |    6 +++---
 clutter/clutter-version.h.in                 |    6 +++---
 clutter/clutter-zoom-action.h                |    6 +++---
 71 files changed, 214 insertions(+), 210 deletions(-)
---
diff --git a/clutter/clutter-action.h b/clutter/clutter-action.h
index 56f31bb..fe9f19f 100644
--- a/clutter/clutter-action.h
+++ b/clutter/clutter-action.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_ACTION_H__
+#define __CLUTTER_ACTION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_ACTION_H__
-#define __CLUTTER_ACTION_H__
-
 #include <clutter/clutter-actor-meta.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-actor-meta.h b/clutter/clutter-actor-meta.h
index 25b904c..e954f36 100644
--- a/clutter/clutter-actor-meta.h
+++ b/clutter/clutter-actor-meta.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_ACTOR_META_H__
+#define __CLUTTER_ACTOR_META_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_ACTOR_META_H__
-#define __CLUTTER_ACTOR_META_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h
index cd5e10d..a821a61 100644
--- a/clutter/clutter-actor.h
+++ b/clutter/clutter-actor.h
@@ -22,13 +22,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_ACTOR_H__
+#define __CLUTTER_ACTOR_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_ACTOR_H__
-#define __CLUTTER_ACTOR_H__
-
 /* clutter-actor.h */
 
 #include <gio/gio.h>
diff --git a/clutter/clutter-align-constraint.h b/clutter/clutter-align-constraint.h
index 9b63f42..212be8b 100644
--- a/clutter/clutter-align-constraint.h
+++ b/clutter/clutter-align-constraint.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_ALIGN_CONSTRAINT_H__
+#define __CLUTTER_ALIGN_CONSTRAINT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_ALIGN_CONSTRAINT_H__
-#define __CLUTTER_ALIGN_CONSTRAINT_H__
-
 #include <clutter/clutter-constraint.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-backend.h b/clutter/clutter-backend.h
index e14d5d2..9470e2e 100644
--- a/clutter/clutter-backend.h
+++ b/clutter/clutter-backend.h
@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_BACKEND_H__
+#define __CLUTTER_BACKEND_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_BACKEND_H__
-#define __CLUTTER_BACKEND_H__
-
 #include <cairo.h>
 #include <pango/pango.h>
 
diff --git a/clutter/clutter-bin-layout.h b/clutter/clutter-bin-layout.h
index fc89e0b..f823b70 100644
--- a/clutter/clutter-bin-layout.h
+++ b/clutter/clutter-bin-layout.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_BIN_LAYOUT_H__
+#define __CLUTTER_BIN_LAYOUT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_BIN_LAYOUT_H__
-#define __CLUTTER_BIN_LAYOUT_H__
-
 #include <clutter/clutter-layout-manager.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-bind-constraint.h b/clutter/clutter-bind-constraint.h
index 36e2b48..523fb18 100644
--- a/clutter/clutter-bind-constraint.h
+++ b/clutter/clutter-bind-constraint.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_BIND_CONSTRAINT_H__
+#define __CLUTTER_BIND_CONSTRAINT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_BIND_CONSTRAINT_H__
-#define __CLUTTER_BIND_CONSTRAINT_H__
-
 #include <clutter/clutter-constraint.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-binding-pool.h b/clutter/clutter-binding-pool.h
index 6df5260..2830d27 100644
--- a/clutter/clutter-binding-pool.h
+++ b/clutter/clutter-binding-pool.h
@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_BINDING_POOL_H__
+#define __CLUTTER_BINDING_POOL_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_BINDING_POOL_H__
-#define __CLUTTER_BINDING_POOL_H__
-
 #include <glib-object.h>
 #include <clutter/clutter-event.h>
 
diff --git a/clutter/clutter-blur-effect.h b/clutter/clutter-blur-effect.h
index ca96d80..4e1b83e 100644
--- a/clutter/clutter-blur-effect.h
+++ b/clutter/clutter-blur-effect.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_BLUR_EFFECT_H__
+#define __CLUTTER_BLUR_EFFECT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_BLUR_EFFECT_H__
-#define __CLUTTER_BLUR_EFFECT_H__
-
 #include <clutter/clutter-effect.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-box-layout.h b/clutter/clutter-box-layout.h
index 3c5547e..a5c085c 100644
--- a/clutter/clutter-box-layout.h
+++ b/clutter/clutter-box-layout.h
@@ -25,13 +25,13 @@
  *   Thomas Wood <thomas wood intel com>
  */
 
+#ifndef __CLUTTER_BOX_LAYOUT_H__
+#define __CLUTTER_BOX_LAYOUT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_BOX_LAYOUT_H__
-#define __CLUTTER_BOX_LAYOUT_H__
-
 #include <clutter/clutter-layout-manager.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-brightness-contrast-effect.h b/clutter/clutter-brightness-contrast-effect.h
index f7a204f..0d9094a 100644
--- a/clutter/clutter-brightness-contrast-effect.h
+++ b/clutter/clutter-brightness-contrast-effect.h
@@ -22,13 +22,13 @@
  *   Joseph Scheuhammer <clown alum mit edu>
  */
 
+#ifndef __CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_H__
+#define __CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_H__
-#define __CLUTTER_BRIGHTNESS_CONTRAST_EFFECT_H__
-
 #include <clutter/clutter-color.h>
 #include <clutter/clutter-effect.h>
 
diff --git a/clutter/clutter-cairo.h b/clutter/clutter-cairo.h
index 993b3e1..9b2ad05 100644
--- a/clutter/clutter-cairo.h
+++ b/clutter/clutter-cairo.h
@@ -19,13 +19,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_CAIRO_H__
+#define __CLUTTER_CAIRO_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_CAIRO_H__
-#define __CLUTTER_CAIRO_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-canvas.h b/clutter/clutter-canvas.h
index a1ab28a..ed62dd4 100644
--- a/clutter/clutter-canvas.h
+++ b/clutter/clutter-canvas.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_CANVAS_H__
+#define __CLUTTER_CANVAS_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_CANVAS_H__
-#define __CLUTTER_CANVAS_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-child-meta.h b/clutter/clutter-child-meta.h
index 7e785a9..02d9e9a 100644
--- a/clutter/clutter-child-meta.h
+++ b/clutter/clutter-child-meta.h
@@ -25,13 +25,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_CHILD_META_H__
+#define __CLUTTER_CHILD_META_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_CHILD_META_H__
-#define __CLUTTER_CHILD_META_H__
-
 #include <glib-object.h>
 #include <clutter/clutter-types.h>
 
diff --git a/clutter/clutter-click-action.h b/clutter/clutter-click-action.h
index bd8d3e2..942efd0 100644
--- a/clutter/clutter-click-action.h
+++ b/clutter/clutter-click-action.h
@@ -25,13 +25,13 @@
  *   Colin Walters <walters verbum org>
  */
 
+#ifndef __CLUTTER_CLICK_ACTION_H__
+#define __CLUTTER_CLICK_ACTION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_CLICK_ACTION_H__
-#define __CLUTTER_CLICK_ACTION_H__
-
 #include <clutter/clutter-action.h>
 #include <clutter/clutter-event.h>
 
diff --git a/clutter/clutter-clone.h b/clutter/clutter-clone.h
index 24958de..6cc503c 100644
--- a/clutter/clutter-clone.h
+++ b/clutter/clutter-clone.h
@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_CLONE_H__
+#define __CLUTTER_CLONE_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_CLONE_H__
-#define __CLUTTER_CLONE_H__
-
 #include <clutter/clutter-actor.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-color-static.h b/clutter/clutter-color-static.h
index 028db6a..766864c 100644
--- a/clutter/clutter-color-static.h
+++ b/clutter/clutter-color-static.h
@@ -19,13 +19,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_COLOR_STATIC_H__
+#define __CLUTTER_COLOR_STATIC_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_COLOR_STATIC_H__
-#define __CLUTTER_COLOR_STATIC_H__
-
 #define __CLUTTER_COLOR_SYM(x)          (clutter_color_get_static (CLUTTER_COLOR_##x))
 
 #define CLUTTER_COLOR_White             (__CLUTTER_COLOR_SYM (WHITE))
diff --git a/clutter/clutter-color.h b/clutter/clutter-color.h
index cd8e5cc..913ed69 100644
--- a/clutter/clutter-color.h
+++ b/clutter/clutter-color.h
@@ -23,13 +23,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_COLOR_H__
+#define __CLUTTER_COLOR_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_COLOR_H__
-#define __CLUTTER_COLOR_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-colorize-effect.h b/clutter/clutter-colorize-effect.h
index fb4d379..f8f8436 100644
--- a/clutter/clutter-colorize-effect.h
+++ b/clutter/clutter-colorize-effect.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_COLORIZE_EFFECT_H__
+#define __CLUTTER_COLORIZE_EFFECT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_COLORIZE_EFFECT_H__
-#define __CLUTTER_COLORIZE_EFFECT_H__
-
 #include <clutter/clutter-color.h>
 #include <clutter/clutter-effect.h>
 
diff --git a/clutter/clutter-constraint.h b/clutter/clutter-constraint.h
index ccd20cb..aba07f6 100644
--- a/clutter/clutter-constraint.h
+++ b/clutter/clutter-constraint.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_CONSTRAINT_H__
+#define __CLUTTER_CONSTRAINT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_CONSTRAINT_H__
-#define __CLUTTER_CONSTRAINT_H__
-
 #include <clutter/clutter-actor-meta.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-container.h b/clutter/clutter-container.h
index 990ffb7..0fc3cef 100644
--- a/clutter/clutter-container.h
+++ b/clutter/clutter-container.h
@@ -24,13 +24,13 @@
  * Author: Emmanuele Bassi <ebassi openedhand com>
  */
 
+#ifndef __CLUTTER_CONTAINER_H__
+#define __CLUTTER_CONTAINER_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_CONTAINER_H__
-#define __CLUTTER_CONTAINER_H__
-
 #include <clutter/clutter-actor.h>
 #include <clutter/clutter-child-meta.h>
 #include <clutter/clutter-types.h>
diff --git a/clutter/clutter-content.h b/clutter/clutter-content.h
index 1ca45de..84bfa0e 100644
--- a/clutter/clutter-content.h
+++ b/clutter/clutter-content.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_CONTENT_H__
+#define __CLUTTER_CONTENT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_CONTENT_H__
-#define __CLUTTER_CONTENT_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-deform-effect.h b/clutter/clutter-deform-effect.h
index dc6eabc..08d0ca9 100644
--- a/clutter/clutter-deform-effect.h
+++ b/clutter/clutter-deform-effect.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_DEFORM_EFFECT_H__
+#define __CLUTTER_DEFORM_EFFECT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_DEFORM_EFFECT_H__
-#define __CLUTTER_DEFORM_EFFECT_H__
-
 #include <cogl/cogl.h>
 #include <clutter/clutter-offscreen-effect.h>
 
diff --git a/clutter/clutter-desaturate-effect.h b/clutter/clutter-desaturate-effect.h
index 08c1583..58f10a4 100644
--- a/clutter/clutter-desaturate-effect.h
+++ b/clutter/clutter-desaturate-effect.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_DESATURATE_EFFECT_H__
+#define __CLUTTER_DESATURATE_EFFECT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_DESATURATE_EFFECT_H__
-#define __CLUTTER_DESATURATE_EFFECT_H__
-
 #include <clutter/clutter-effect.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-device-manager.h b/clutter/clutter-device-manager.h
index 177d452..0bb9041 100644
--- a/clutter/clutter-device-manager.h
+++ b/clutter/clutter-device-manager.h
@@ -21,13 +21,13 @@
  * Author: Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_DEVICE_MANAGER_H__
+#define __CLUTTER_DEVICE_MANAGER_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_DEVICE_MANAGER_H__
-#define __CLUTTER_DEVICE_MANAGER_H__
-
 #include <clutter/clutter-input-device.h>
 #include <clutter/clutter-stage.h>
 
diff --git a/clutter/clutter-drag-action.h b/clutter/clutter-drag-action.h
index 3e0ed26..a11d738 100644
--- a/clutter/clutter-drag-action.h
+++ b/clutter/clutter-drag-action.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_DRAG_ACTION_H__
+#define __CLUTTER_DRAG_ACTION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_DRAG_ACTION_H__
-#define __CLUTTER_DRAG_ACTION_H__
-
 #include <clutter/clutter-action.h>
 #include <clutter/clutter-event.h>
 
diff --git a/clutter/clutter-drop-action.h b/clutter/clutter-drop-action.h
index 9c58242..2d2b40d 100644
--- a/clutter/clutter-drop-action.h
+++ b/clutter/clutter-drop-action.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_DROP_ACTION_H__
+#define __CLUTTER_DROP_ACTION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be directly included."
 #endif
 
-#ifndef __CLUTTER_DROP_ACTION_H__
-#define __CLUTTER_DROP_ACTION_H__
-
 #include <clutter/clutter-action.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-effect.h b/clutter/clutter-effect.h
index b5286fd..6cfc2f2 100644
--- a/clutter/clutter-effect.h
+++ b/clutter/clutter-effect.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_EFFECT_H__
+#define __CLUTTER_EFFECT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_EFFECT_H__
-#define __CLUTTER_EFFECT_H__
-
 #include <clutter/clutter-actor-meta.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-enums.h b/clutter/clutter-enums.h
index 859579d..d2c8974 100644
--- a/clutter/clutter-enums.h
+++ b/clutter/clutter-enums.h
@@ -19,13 +19,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_ENUMS_H__
+#define __CLUTTER_ENUMS_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_ENUMS_H__
-#define __CLUTTER_ENUMS_H__
-
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-event.h b/clutter/clutter-event.h
index 9e39693..5df8dff 100644
--- a/clutter/clutter-event.h
+++ b/clutter/clutter-event.h
@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_EVENT_H__
+#define __CLUTTER_EVENT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_EVENT_H__
-#define __CLUTTER_EVENT_H__
-
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-input-device.h>
 
diff --git a/clutter/clutter-feature.h b/clutter/clutter-feature.h
index 083f1a9..1427e22 100644
--- a/clutter/clutter-feature.h
+++ b/clutter/clutter-feature.h
@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_FEATURE_H__
+#define __CLUTTER_FEATURE_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_FEATURE_H__
-#define __CLUTTER_FEATURE_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-fixed-layout.h b/clutter/clutter-fixed-layout.h
index a64d900..01a2fd6 100644
--- a/clutter/clutter-fixed-layout.h
+++ b/clutter/clutter-fixed-layout.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_FIXED_LAYOUT_H__
+#define __CLUTTER_FIXED_LAYOUT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_FIXED_LAYOUT_H__
-#define __CLUTTER_FIXED_LAYOUT_H__
-
 #include <clutter/clutter-layout-manager.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-flow-layout.h b/clutter/clutter-flow-layout.h
index f552c54..d44857b 100644
--- a/clutter/clutter-flow-layout.h
+++ b/clutter/clutter-flow-layout.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_FLOW_LAYOUT_H__
+#define __CLUTTER_FLOW_LAYOUT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_FLOW_LAYOUT_H__
-#define __CLUTTER_FLOW_LAYOUT_H__
-
 #include <clutter/clutter-layout-manager.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-gesture-action.h b/clutter/clutter-gesture-action.h
index ca7db12..46d3c45 100644
--- a/clutter/clutter-gesture-action.h
+++ b/clutter/clutter-gesture-action.h
@@ -23,13 +23,13 @@
  *   Tomeu Vizoso <tomeu vizoso collabora co uk>
  */
 
+#ifndef __CLUTTER_GESTURE_ACTION_H__
+#define __CLUTTER_GESTURE_ACTION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_GESTURE_ACTION_H__
-#define __CLUTTER_GESTURE_ACTION_H__
-
 #include <clutter/clutter-action.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-grid-layout.h b/clutter/clutter-grid-layout.h
index 1c7644a..c04a5ba 100644
--- a/clutter/clutter-grid-layout.h
+++ b/clutter/clutter-grid-layout.h
@@ -26,13 +26,13 @@
  *   Matthias Clasen
  */
 
+#ifndef __CLUTTER_GRID_LAYOUT_H__
+#define __CLUTTER_GRID_LAYOUT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_GRID_LAYOUT_H__
-#define __CLUTTER_GRID_LAYOUT_H__
-
 #include <clutter/clutter-layout-manager.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-group.h b/clutter/clutter-group.h
index 49643e8..40f71bc 100644
--- a/clutter/clutter-group.h
+++ b/clutter/clutter-group.h
@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_GROUP_H__
+#define __CLUTTER_GROUP_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_GROUP_H__
-#define __CLUTTER_GROUP_H__
-
 #include <glib-object.h>
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-actor.h>
diff --git a/clutter/clutter-image.h b/clutter/clutter-image.h
index 2819b79..5be0572 100644
--- a/clutter/clutter-image.h
+++ b/clutter/clutter-image.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_IMAGE_H__
+#define __CLUTTER_IMAGE_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_IMAGE_H__
-#define __CLUTTER_IMAGE_H__
-
 #include <cogl/cogl.h>
 #include <clutter/clutter-types.h>
 
diff --git a/clutter/clutter-input-device.h b/clutter/clutter-input-device.h
index 3019993..621f44d 100644
--- a/clutter/clutter-input-device.h
+++ b/clutter/clutter-input-device.h
@@ -21,13 +21,13 @@
  * Author: Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_INPUT_DEVICE_H__
+#define __CLUTTER_INPUT_DEVICE_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_INPUT_DEVICE_H__
-#define __CLUTTER_INPUT_DEVICE_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-interval.h b/clutter/clutter-interval.h
index fa36698..f3d62cb 100644
--- a/clutter/clutter-interval.h
+++ b/clutter/clutter-interval.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_INTERVAL_H__
+#define __CLUTTER_INTERVAL_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_INTERVAL_H__
-#define __CLUTTER_INTERVAL_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-keyframe-transition.h b/clutter/clutter-keyframe-transition.h
index e07ada4..d0fe84e 100644
--- a/clutter/clutter-keyframe-transition.h
+++ b/clutter/clutter-keyframe-transition.h
@@ -21,13 +21,13 @@
  * Author: Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_KEYFRAME_TRANSITION_H__
+#define __CLUTTER_KEYFRAME_TRANSITION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_KEYFRAME_TRANSITION_H__
-#define __CLUTTER_KEYFRAME_TRANSITION_H__
-
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-property-transition.h>
 
diff --git a/clutter/clutter-layout-manager.h b/clutter/clutter-layout-manager.h
index cbfac1e..8bb9099 100644
--- a/clutter/clutter-layout-manager.h
+++ b/clutter/clutter-layout-manager.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_LAYOUT_MANAGER_H__
+#define __CLUTTER_LAYOUT_MANAGER_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_LAYOUT_MANAGER_H__
-#define __CLUTTER_LAYOUT_MANAGER_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-layout-meta.h b/clutter/clutter-layout-meta.h
index 88ab970..6de0b47 100644
--- a/clutter/clutter-layout-meta.h
+++ b/clutter/clutter-layout-meta.h
@@ -22,13 +22,13 @@
  *      Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_LAYOUT_META_H__
+#define __CLUTTER_LAYOUT_META_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_LAYOUT_META_H__
-#define __CLUTTER_LAYOUT_META_H__
-
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-child-meta.h>
 #include <clutter/clutter-layout-manager.h>
diff --git a/clutter/clutter-macros.h b/clutter/clutter-macros.h
index e78207e..e38ec23 100644
--- a/clutter/clutter-macros.h
+++ b/clutter/clutter-macros.h
@@ -19,13 +19,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_MACROS_H__
+#define __CLUTTER_MACROS_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_MACROS_H__
-#define __CLUTTER_MACROS_H__
-
 #include <clutter/clutter-version.h>
 
 /**
diff --git a/clutter/clutter-main.h b/clutter/clutter-main.h
index c7f2460..21bdb06 100644
--- a/clutter/clutter-main.h
+++ b/clutter/clutter-main.h
@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_MAIN_H__
+#define __CLUTTER_MAIN_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_MAIN_H__
-#define __CLUTTER_MAIN_H__
-
 #include <clutter/clutter-actor.h>
 #include <clutter/clutter-stage.h>
 #include <pango/pango.h>
diff --git a/clutter/clutter-offscreen-effect.h b/clutter/clutter-offscreen-effect.h
index 8fd547e..c61fbab 100644
--- a/clutter/clutter-offscreen-effect.h
+++ b/clutter/clutter-offscreen-effect.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_OFFSCREEN_EFFECT_H__
+#define __CLUTTER_OFFSCREEN_EFFECT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_OFFSCREEN_EFFECT_H__
-#define __CLUTTER_OFFSCREEN_EFFECT_H__
-
 #include <cogl/cogl.h>
 #include <clutter/clutter-effect.h>
 #include <clutter/clutter-cogl-compat.h>
diff --git a/clutter/clutter-page-turn-effect.h b/clutter/clutter-page-turn-effect.h
index 63beb20..b3fb804 100644
--- a/clutter/clutter-page-turn-effect.h
+++ b/clutter/clutter-page-turn-effect.h
@@ -25,13 +25,13 @@
  *   Chris Lord <chris linux intel com>
  */
 
+#ifndef __CLUTTER_PAGE_TURN_EFFECT_H__
+#define __CLUTTER_PAGE_TURN_EFFECT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_PAGE_TURN_EFFECT_H__
-#define __CLUTTER_PAGE_TURN_EFFECT_H__
-
 #include <clutter/clutter-deform-effect.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-paint-node.h b/clutter/clutter-paint-node.h
index 534b39d..1f1a739 100644
--- a/clutter/clutter-paint-node.h
+++ b/clutter/clutter-paint-node.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_PAINT_NODE_H__
+#define __CLUTTER_PAINT_NODE_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_PAINT_NODE_H__
-#define __CLUTTER_PAINT_NODE_H__
-
 #include <cogl/cogl.h>
 #include <clutter/clutter-types.h>
 
diff --git a/clutter/clutter-paint-nodes.h b/clutter/clutter-paint-nodes.h
index 8842e3f..28709ed 100644
--- a/clutter/clutter-paint-nodes.h
+++ b/clutter/clutter-paint-nodes.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_PAINT_NODES_H__
+#define __CLUTTER_PAINT_NODES_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_PAINT_NODES_H__
-#define __CLUTTER_PAINT_NODES_H__
-
 #include <cogl/cogl.h>
 #include <clutter/clutter-types.h>
 
diff --git a/clutter/clutter-pan-action.h b/clutter/clutter-pan-action.h
index 37f0c99..866ec97 100644
--- a/clutter/clutter-pan-action.h
+++ b/clutter/clutter-pan-action.h
@@ -30,13 +30,13 @@
  *   Chris Lord <chris linux intel com>
  */
 
+#ifndef __CLUTTER_PAN_ACTION_H__
+#define __CLUTTER_PAN_ACTION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_PAN_ACTION_H__
-#define __CLUTTER_PAN_ACTION_H__
-
 #include <clutter/clutter-gesture-action.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-path-constraint.h b/clutter/clutter-path-constraint.h
index 9c77d4f..f6d65ea 100644
--- a/clutter/clutter-path-constraint.h
+++ b/clutter/clutter-path-constraint.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_PATH_CONSTRAINT_H__
+#define __CLUTTER_PATH_CONSTRAINT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_PATH_CONSTRAINT_H__
-#define __CLUTTER_PATH_CONSTRAINT_H__
-
 #include <clutter/clutter-constraint.h>
 #include <clutter/clutter-path.h>
 
diff --git a/clutter/clutter-path.h b/clutter/clutter-path.h
index c170bb3..38133a5 100644
--- a/clutter/clutter-path.h
+++ b/clutter/clutter-path.h
@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_PATH_H__
+#define __CLUTTER_PATH_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_PATH_H__
-#define __CLUTTER_PATH_H__
-
 #include <cairo.h>
 #include <clutter/clutter-types.h>
 
diff --git a/clutter/clutter-property-transition.h b/clutter/clutter-property-transition.h
index 5ea2e9b..a53f034 100644
--- a/clutter/clutter-property-transition.h
+++ b/clutter/clutter-property-transition.h
@@ -21,13 +21,13 @@
  * Author: Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_PROPERTY_TRANSITION_H__
+#define __CLUTTER_PROPERTY_TRANSITION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_PROPERTY_TRANSITION_H__
-#define __CLUTTER_PROPERTY_TRANSITION_H__
-
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-transition.h>
 
diff --git a/clutter/clutter-rotate-action.h b/clutter/clutter-rotate-action.h
index 8f6f278..c739054 100644
--- a/clutter/clutter-rotate-action.h
+++ b/clutter/clutter-rotate-action.h
@@ -22,13 +22,13 @@
  *   Lionel Landwerlin <lionel g landwerlin linux intel com>
  */
 
+#ifndef __CLUTTER_ROTATE_ACTION_H__
+#define __CLUTTER_ROTATE_ACTION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_ROTATE_ACTION_H__
-#define __CLUTTER_ROTATE_ACTION_H__
-
 #include <clutter/clutter-gesture-action.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-script.h b/clutter/clutter-script.h
index 4ac5c8f..37f4a05 100644
--- a/clutter/clutter-script.h
+++ b/clutter/clutter-script.h
@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_SCRIPT_H__
+#define __CLUTTER_SCRIPT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_SCRIPT_H__
-#define __CLUTTER_SCRIPT_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-scriptable.h b/clutter/clutter-scriptable.h
index f66ec86..61beb29 100644
--- a/clutter/clutter-scriptable.h
+++ b/clutter/clutter-scriptable.h
@@ -22,13 +22,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_SCRIPTABLE_H__
+#define __CLUTTER_SCRIPTABLE_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_SCRIPTABLE_H__
-#define __CLUTTER_SCRIPTABLE_H__
-
 #include <glib-object.h>
 #include <json-glib/json-glib.h>
 #include <clutter/clutter-script.h>
diff --git a/clutter/clutter-scroll-actor.h b/clutter/clutter-scroll-actor.h
index 4665cfa..be3cbc2 100644
--- a/clutter/clutter-scroll-actor.h
+++ b/clutter/clutter-scroll-actor.h
@@ -19,13 +19,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_SCROLL_ACTOR_H__
+#define __CLUTTER_SCROLL_ACTOR_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_SCROLL_ACTOR_H__
-#define __CLUTTER_SCROLL_ACTOR_H__
-
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-actor.h>
 
diff --git a/clutter/clutter-settings.h b/clutter/clutter-settings.h
index 6e5719a..7c9fe42 100644
--- a/clutter/clutter-settings.h
+++ b/clutter/clutter-settings.h
@@ -1,10 +1,10 @@
+#ifndef __CLUTTER_SETTINGS_H__
+#define __CLUTTER_SETTINGS_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_SETTINGS_H__
-#define __CLUTTER_SETTINGS_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-shader-effect.h b/clutter/clutter-shader-effect.h
index 0891ba5..fc9775e 100644
--- a/clutter/clutter-shader-effect.h
+++ b/clutter/clutter-shader-effect.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_SHADER_EFFECT_H__
+#define __CLUTTER_SHADER_EFFECT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_SHADER_EFFECT_H__
-#define __CLUTTER_SHADER_EFFECT_H__
-
 #include <clutter/clutter-offscreen-effect.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-shader-types.h b/clutter/clutter-shader-types.h
index 0906243..f144b6c 100644
--- a/clutter/clutter-shader-types.h
+++ b/clutter/clutter-shader-types.h
@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_SHADER_TYPES_H__
+#define __CLUTTER_SHADER_TYPES_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_SHADER_TYPES_H__
-#define __CLUTTER_SHADER_TYPES_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-snap-constraint.h b/clutter/clutter-snap-constraint.h
index 9039536..5a788dc 100644
--- a/clutter/clutter-snap-constraint.h
+++ b/clutter/clutter-snap-constraint.h
@@ -22,13 +22,13 @@
  *   Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_SNAP_CONSTRAINT_H__
+#define __CLUTTER_SNAP_CONSTRAINT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_SNAP_CONSTRAINT_H__
-#define __CLUTTER_SNAP_CONSTRAINT_H__
-
 #include <clutter/clutter-constraint.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-stage-manager.h b/clutter/clutter-stage-manager.h
index 2838b64..fa3badd 100644
--- a/clutter/clutter-stage-manager.h
+++ b/clutter/clutter-stage-manager.h
@@ -21,13 +21,13 @@
  * Author: Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_STAGE_MANAGER_H__
+#define __CLUTTER_STAGE_MANAGER_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_STAGE_MANAGER_H__
-#define __CLUTTER_STAGE_MANAGER_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-stage.h b/clutter/clutter-stage.h
index d4b3bec..8a55efb 100644
--- a/clutter/clutter-stage.h
+++ b/clutter/clutter-stage.h
@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_STAGE_H__
+#define __CLUTTER_STAGE_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_STAGE_H__
-#define __CLUTTER_STAGE_H__
-
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-group.h>
 
diff --git a/clutter/clutter-tap-action.h b/clutter/clutter-tap-action.h
index 8bf80a3..ade9c42 100644
--- a/clutter/clutter-tap-action.h
+++ b/clutter/clutter-tap-action.h
@@ -31,13 +31,13 @@
  *   Chris Lord <chris linux intel com>
  */
 
+#ifndef __CLUTTER_TAP_ACTION_H__
+#define __CLUTTER_TAP_ACTION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_TAP_ACTION_H__
-#define __CLUTTER_TAP_ACTION_H__
-
 #include <clutter/clutter-gesture-action.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-text-buffer.h b/clutter/clutter-text-buffer.h
index a524d93..468b060 100644
--- a/clutter/clutter-text-buffer.h
+++ b/clutter/clutter-text-buffer.h
@@ -19,13 +19,13 @@
  * Author: Stef Walter <stefw collabora co uk>
  */
 
+#ifndef __CLUTTER_TEXT_BUFFER_H__
+#define __CLUTTER_TEXT_BUFFER_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_TEXT_BUFFER_H__
-#define __CLUTTER_TEXT_BUFFER_H__
-
 #include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-text.h b/clutter/clutter-text.h
index 95e6a66..c046dd4 100644
--- a/clutter/clutter-text.h
+++ b/clutter/clutter-text.h
@@ -22,13 +22,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_TEXT_H__
+#define __CLUTTER_TEXT_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_TEXT_H__
-#define __CLUTTER_TEXT_H__
-
 #include <clutter/clutter-actor.h>
 #include <clutter/clutter-text-buffer.h>
 #include <pango/pango.h>
diff --git a/clutter/clutter-transition-group.h b/clutter/clutter-transition-group.h
index 0408fc5..b2a9ce1 100644
--- a/clutter/clutter-transition-group.h
+++ b/clutter/clutter-transition-group.h
@@ -24,6 +24,10 @@
 #ifndef __CLUTTER_TRANSITION_GROUP_H__
 #define __CLUTTER_TRANSITION_GROUP_H__
 
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-transition.h>
 
diff --git a/clutter/clutter-transition.h b/clutter/clutter-transition.h
index f536a4e..7ea9bfa 100644
--- a/clutter/clutter-transition.h
+++ b/clutter/clutter-transition.h
@@ -21,13 +21,13 @@
  * Author: Emmanuele Bassi <ebassi linux intel com>
  */
 
+#ifndef __CLUTTER_TRANSITION_H__
+#define __CLUTTER_TRANSITION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_TRANSITION_H__
-#define __CLUTTER_TRANSITION_H__
-
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-timeline.h>
 
diff --git a/clutter/clutter-types.h b/clutter/clutter-types.h
index f9b835a..a8a08a3 100644
--- a/clutter/clutter-types.h
+++ b/clutter/clutter-types.h
@@ -21,13 +21,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_TYPES_H__
+#define __CLUTTER_TYPES_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_TYPES_H__
-#define __CLUTTER_TYPES_H__
-
 #include <cairo.h>
 #include <cogl/cogl.h>
 #include <clutter/clutter-macros.h>
diff --git a/clutter/clutter-units.h b/clutter/clutter-units.h
index c558b10..549be9f 100644
--- a/clutter/clutter-units.h
+++ b/clutter/clutter-units.h
@@ -24,13 +24,13 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __CLUTTER_UNITS_H__
+#define __CLUTTER_UNITS_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_UNITS_H__
-#define __CLUTTER_UNITS_H__
-
 #include <glib-object.h>
 
 #include <cogl/cogl.h>
diff --git a/clutter/clutter-version.h.in b/clutter/clutter-version.h.in
index 7663323..29eec45 100644
--- a/clutter/clutter-version.h.in
+++ b/clutter/clutter-version.h.in
@@ -23,13 +23,13 @@
  *
  */
 
+#ifndef __CLUTTER_VERSION_H__
+#define __CLUTTER_VERSION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_VERSION_H__
-#define __CLUTTER_VERSION_H__
-
 /**
  * SECTION:clutter-version
  * @short_description: Versioning utility macros
diff --git a/clutter/clutter-zoom-action.h b/clutter/clutter-zoom-action.h
index 7ebbe4f..496b36e 100644
--- a/clutter/clutter-zoom-action.h
+++ b/clutter/clutter-zoom-action.h
@@ -22,13 +22,13 @@
  *   Lionel Landwerlin <lionel g landwerlin linux intel com>
  */
 
+#ifndef __CLUTTER_ZOOM_ACTION_H__
+#define __CLUTTER_ZOOM_ACTION_H__
+
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
 #error "Only <clutter/clutter.h> can be included directly."
 #endif
 
-#ifndef __CLUTTER_ZOOM_ACTION_H__
-#define __CLUTTER_ZOOM_ACTION_H__
-
 #include <clutter/clutter-event.h>
 #include <clutter/clutter-gesture-action.h>
 #include <clutter/clutter-types.h>