From 550168eee31a41117be347dc67f845ff8700252d Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu, 21 Jun 2012 17:15:44 +0100
Subject: [PATCH] Clean up deprecated header inclusion

The build should not add deprecated/ into the default INCLUDE paths, so
that deprecated headers are clearly separated; this will make it easier
to get rid of them when we branch out for 2.0.
---
 clutter/Makefile.am               | 1 -
 clutter/clutter-interval.c        | 3 ++-
 clutter/clutter-main.c            | 1 -
 clutter/clutter-script.c          | 2 +-
 clutter/clutter-stage.c           | 1 -
 clutter/cogl/clutter-stage-cogl.c | 1 -
 clutter/osx/clutter-backend-osx.c | 1 -
 7 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 2acd2e3f9..7899493b0 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -14,7 +14,6 @@ lib_LTLIBRARIES =
 INCLUDES = \
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/clutter				\
-	-I$(top_srcdir)/clutter/deprecated		\
 	-I$(top_srcdir)/clutter/cally			\
 	-I$(top_builddir)				\
 	-I$(top_builddir)/clutter			\
diff --git a/clutter/clutter-interval.c b/clutter/clutter-interval.c
index 1cbafdabb..13649ad16 100644
--- a/clutter/clutter-interval.c
+++ b/clutter/clutter-interval.c
@@ -58,11 +58,12 @@
 #include <gobject/gvaluecollector.h>
 
 #include "clutter-color.h"
-#include "clutter-fixed.h"
 #include "clutter-interval.h"
 #include "clutter-private.h"
 #include "clutter-units.h"
 
+#include "deprecated/clutter-fixed.h"
+
 enum
 {
   PROP_0,
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 64df9f56e..1e9e8a077 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -104,7 +104,6 @@
 #include "clutter-device-manager-private.h"
 #include "clutter-event-private.h"
 #include "clutter-feature.h"
-#include "clutter-frame-source.h"
 #include "clutter-main.h"
 #include "clutter-master-clock.h"
 #include "clutter-private.h"
diff --git a/clutter/clutter-script.c b/clutter/clutter-script.c
index 6c02537bd..6d0b6071f 100644
--- a/clutter/clutter-script.c
+++ b/clutter/clutter-script.c
@@ -237,7 +237,6 @@
 #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 
 #include "clutter-actor.h"
-#include "clutter-alpha.h"
 #include "clutter-stage.h"
 #include "clutter-texture.h"
 
@@ -249,6 +248,7 @@
 #include "clutter-private.h"
 #include "clutter-debug.h"
 
+#include "deprecated/clutter-alpha.h"
 #include "deprecated/clutter-behaviour.h"
 #include "deprecated/clutter-container.h"
 #include "deprecated/clutter-state.h"
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index bf8a32fe8..08dfd9355 100644
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -75,7 +75,6 @@
 #include "clutter-profile.h"
 #include "clutter-stage-manager-private.h"
 #include "clutter-stage-private.h"
-#include "clutter-util.h"
 #include "clutter-version.h" 	/* For flavour */
 #include "clutter-private.h"
 
diff --git a/clutter/cogl/clutter-stage-cogl.c b/clutter/cogl/clutter-stage-cogl.c
index cab4474f3..68b98b1a3 100644
--- a/clutter/cogl/clutter-stage-cogl.c
+++ b/clutter/cogl/clutter-stage-cogl.c
@@ -46,7 +46,6 @@
 #include "clutter-private.h"
 #include "clutter-profile.h"
 #include "clutter-stage-private.h"
-#include "clutter-util.h"
 
 static void clutter_stage_window_iface_init (ClutterStageWindowIface *iface);
 
diff --git a/clutter/osx/clutter-backend-osx.c b/clutter/osx/clutter-backend-osx.c
index 4fe2988c4..1438a50f5 100644
--- a/clutter/osx/clutter-backend-osx.c
+++ b/clutter/osx/clutter-backend-osx.c
@@ -30,7 +30,6 @@
 
 #include "clutter-debug.h"
 #include "clutter-private.h"
-#include "clutter-shader.h"
 #include "clutter-stage-private.h"
 
 #include "cogl/cogl.h"