From 694632ce95bfc2c14791214acc435743dba4df2e Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu, 18 Nov 2010 18:23:49 +0000
Subject: [PATCH] build: Re-arrange headers

Try to minimize the included headers, especially in clutter-actor.h.
---
 clutter/clutter-actor.c            |  1 +
 clutter/clutter-actor.h            |  6 ++----
 clutter/clutter-color.h            |  5 +----
 clutter/clutter-deform-effect.h    |  2 +-
 clutter/clutter-effect.h           |  1 -
 clutter/clutter-offscreen-effect.h |  1 +
 clutter/clutter-shader.h           |  1 -
 clutter/clutter-texture.c          | 15 +++++++--------
 clutter/clutter-texture.h          |  2 +-
 clutter/clutter-types.h            |  6 +++++-
 10 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index ee4c2f957..e7e8e873c 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -303,6 +303,7 @@
 #include "clutter-profile.h"
 #include "clutter-scriptable.h"
 #include "clutter-script-private.h"
+#include "clutter-shader.h"
 #include "clutter-stage-private.h"
 #include "clutter-units.h"
 
diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h
index 42e35b18f..46eaac430 100644
--- a/clutter/clutter-actor.h
+++ b/clutter/clutter-actor.h
@@ -34,12 +34,10 @@
 #include <pango/pango.h>
 #include <atk/atk.h>
 
-#include <clutter/clutter-types.h>
+#include <cogl/cogl.h>
 
-#include <clutter/clutter-color.h>
-#include <clutter/clutter-effect.h>
+#include <clutter/clutter-types.h>
 #include <clutter/clutter-event.h>
-#include <clutter/clutter-shader.h>
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter-color.h b/clutter/clutter-color.h
index 4ade72063..ca29ebc44 100644
--- a/clutter/clutter-color.h
+++ b/clutter/clutter-color.h
@@ -30,15 +30,12 @@
 #ifndef __CLUTTER_COLOR_H__
 #define __CLUTTER_COLOR_H__
 
-#include <glib-object.h>
-#include <clutter/clutter-fixed.h>
+#include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
 
 #define CLUTTER_TYPE_COLOR	(clutter_color_get_type ())
 
-typedef struct _ClutterColor ClutterColor;
-
 /**
  * ClutterColor:
  * @red: red component, between 0 and 255
diff --git a/clutter/clutter-deform-effect.h b/clutter/clutter-deform-effect.h
index 63ccd4c5a..7650e7100 100644
--- a/clutter/clutter-deform-effect.h
+++ b/clutter/clutter-deform-effect.h
@@ -29,7 +29,7 @@
 #ifndef __CLUTTER_DEFORM_EFFECT_H__
 #define __CLUTTER_DEFORM_EFFECT_H__
 
-#include <clutter/clutter-color.h>
+#include <cogl/cogl.h>
 #include <clutter/clutter-offscreen-effect.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-effect.h b/clutter/clutter-effect.h
index c6a791e97..422c89af5 100644
--- a/clutter/clutter-effect.h
+++ b/clutter/clutter-effect.h
@@ -40,7 +40,6 @@ G_BEGIN_DECLS
 #define CLUTTER_IS_EFFECT_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_EFFECT))
 #define CLUTTER_EFFECT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_EFFECT, ClutterEffectClass))
 
-typedef struct _ClutterEffect           ClutterEffect;
 typedef struct _ClutterEffectClass      ClutterEffectClass;
 
 /**
diff --git a/clutter/clutter-offscreen-effect.h b/clutter/clutter-offscreen-effect.h
index 9c0301633..c9213cbda 100644
--- a/clutter/clutter-offscreen-effect.h
+++ b/clutter/clutter-offscreen-effect.h
@@ -29,6 +29,7 @@
 #ifndef __CLUTTER_OFFSCREEN_EFFECT_H__
 #define __CLUTTER_OFFSCREEN_EFFECT_H__
 
+#include <cogl/cogl.h>
 #include <clutter/clutter-effect.h>
 
 G_BEGIN_DECLS
diff --git a/clutter/clutter-shader.h b/clutter/clutter-shader.h
index b3c2ae483..ef72192e8 100644
--- a/clutter/clutter-shader.h
+++ b/clutter/clutter-shader.h
@@ -65,7 +65,6 @@ typedef enum {
   CLUTTER_SHADER_ERROR_COMPILE
 } ClutterShaderError;
 
-typedef struct _ClutterShader        ClutterShader;
 typedef struct _ClutterShaderPrivate ClutterShaderPrivate;
 typedef struct _ClutterShaderClass   ClutterShaderClass;
 
diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index dbae49b4c..4e1058605 100644
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -44,20 +44,19 @@
 #include "config.h"
 #endif
 
-#include "clutter-actor-private.h"
 #include "clutter-texture.h"
+
+#include "clutter-actor-private.h"
+#include "clutter-debug.h"
+#include "clutter-enum-types.h"
+#include "clutter-feature.h"
 #include "clutter-main.h"
 #include "clutter-marshal.h"
-#include "clutter-feature.h"
-#include "clutter-util.h"
 #include "clutter-private.h"
 #include "clutter-scriptable.h"
-#include "clutter-debug.h"
-#include "clutter-fixed.h"
-#include "clutter-enum-types.h"
+#include "clutter-shader.h"
 #include "clutter-stage-private.h"
-
-#include "cogl/cogl.h"
+#include "clutter-util.h"
 
 static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
 
diff --git a/clutter/clutter-texture.h b/clutter/clutter-texture.h
index 6e17af36f..4340c437f 100644
--- a/clutter/clutter-texture.h
+++ b/clutter/clutter-texture.h
@@ -28,8 +28,8 @@
 #ifndef __CLUTTER_TEXTURE_H__
 #define __CLUTTER_TEXTURE_H__
 
-#include <clutter/clutter-actor.h>
 #include <cogl/cogl.h>
+#include <clutter/clutter-actor.h>
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter-types.h b/clutter/clutter-types.h
index e8fd67307..b5951c5a5 100644
--- a/clutter/clutter-types.h
+++ b/clutter/clutter-types.h
@@ -29,7 +29,6 @@
 #define __CLUTTER_TYPES_H__
 
 #include <glib-object.h>
-#include <clutter/clutter-units.h>
 
 G_BEGIN_DECLS
 
@@ -52,6 +51,11 @@ typedef struct _ClutterAnimator         ClutterAnimator;
 
 typedef struct _ClutterAction           ClutterAction;
 typedef struct _ClutterConstraint       ClutterConstraint;
+typedef struct _ClutterEffect           ClutterEffect;
+
+typedef struct _ClutterShader           ClutterShader;
+
+typedef struct _ClutterColor            ClutterColor;
 
 typedef union _ClutterEvent             ClutterEvent;