From 78b237b535b58332f41252679c03b91bdc5281d1 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Thu, 23 Feb 2012 17:21:57 +0000
Subject: [PATCH] Clean up the included headers

Especially inside ClutterStage.
---
 clutter/clutter-cairo-texture.c  | 1 +
 clutter/clutter-cairo-texture.h  | 1 -
 clutter/clutter-stage.h          | 6 +++---
 clutter/clutter-text.c           | 1 +
 clutter/clutter-texture.c        | 1 +
 clutter/deprecated/clutter-box.c | 1 +
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/clutter/clutter-cairo-texture.c b/clutter/clutter-cairo-texture.c
index c8f165acc..100a6a146 100644
--- a/clutter/clutter-cairo-texture.c
+++ b/clutter/clutter-cairo-texture.c
@@ -74,6 +74,7 @@
 #include "clutter-cairo-texture.h"
 
 #include "clutter-actor-private.h"
+#include "clutter-color.h"
 #include "clutter-debug.h"
 #include "clutter-marshal.h"
 #include "clutter-private.h"
diff --git a/clutter/clutter-cairo-texture.h b/clutter/clutter-cairo-texture.h
index e3936e04c..6b94506dc 100644
--- a/clutter/clutter-cairo-texture.h
+++ b/clutter/clutter-cairo-texture.h
@@ -33,7 +33,6 @@
 #define __CLUTTER_CAIRO_TEXTURE_H__
 
 #include <clutter/clutter-texture.h>
-#include <cairo.h>
 
 G_BEGIN_DECLS
 
diff --git a/clutter/clutter-stage.h b/clutter/clutter-stage.h
index 900c99f49..e3c1d7e9c 100644
--- a/clutter/clutter-stage.h
+++ b/clutter/clutter-stage.h
@@ -30,9 +30,6 @@
 
 #include <clutter/clutter-types.h>
 #include <clutter/clutter-group.h>
-#include <clutter/clutter-color.h>
-#include <clutter/clutter-event.h>
-#include <cairo.h>
 
 G_BEGIN_DECLS
 
@@ -128,6 +125,9 @@ struct _ClutterPerspective
  * Fog settings used to create the depth cueing effect.
  *
  * Since: 0.6
+ *
+ * Deprecated: 1.10: The fog-related API in #ClutterStage has been
+ *   deprecated as well.
  */
 struct _ClutterFog
 {
diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c
index a7635e46d..a74f014c1 100644
--- a/clutter/clutter-text.c
+++ b/clutter/clutter-text.c
@@ -49,6 +49,7 @@
 
 #include "clutter-actor-private.h"
 #include "clutter-binding-pool.h"
+#include "clutter-color.h"
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
 #include "clutter-keysyms.h"
diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index 39f11664c..c521c807f 100644
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -61,6 +61,7 @@
 #include "clutter-texture.h"
 
 #include "clutter-actor-private.h"
+#include "clutter-color.h"
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
 #include "clutter-feature.h"
diff --git a/clutter/deprecated/clutter-box.c b/clutter/deprecated/clutter-box.c
index 9585b857d..51412c633 100644
--- a/clutter/deprecated/clutter-box.c
+++ b/clutter/deprecated/clutter-box.c
@@ -83,6 +83,7 @@
 #include "clutter-box.h"
 
 #include "clutter-actor-private.h"
+#include "clutter-color.h"
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
 #include "clutter-marshal.h"