From f1846bcb53bb8a86b9b62362f579fc81276ac525 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri, 24 Aug 2012 12:35:25 +0100
Subject: [PATCH] 2.0: Remove include directives for deprecated headers

---
 clutter/clutter-animatable.c     | 5 -----
 clutter/clutter-backend.c        | 3 ---
 clutter/clutter-flow-layout.c    | 4 +---
 clutter/clutter-interval.c       | 2 --
 clutter/clutter-layout-manager.c | 5 +----
 clutter/clutter-stage.c          | 3 ---
 clutter/clutter-util.c           | 2 --
 7 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/clutter/clutter-animatable.c b/clutter/clutter-animatable.c
index 089f4f3cb..0e0a97e30 100644
--- a/clutter/clutter-animatable.c
+++ b/clutter/clutter-animatable.c
@@ -49,16 +49,11 @@
 #include "config.h"
 #endif
 
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-
 #include "clutter-animatable.h"
 #include "clutter-interval.h"
 #include "clutter-debug.h"
 #include "clutter-private.h"
 
-#include "deprecated/clutter-animatable.h"
-#include "deprecated/clutter-animation.h"
-
 typedef ClutterAnimatableIface  ClutterAnimatableInterface;
 G_DEFINE_INTERFACE (ClutterAnimatable, clutter_animatable, G_TYPE_OBJECT);
 
diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
index 47a928f50..ac43c85e7 100644
--- a/clutter/clutter-backend.c
+++ b/clutter/clutter-backend.c
@@ -55,9 +55,6 @@
 #include "clutter-stage-window.h"
 #include "clutter-version.h"
 
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-backend.h"
-
 #ifdef HAVE_CLUTTER_WAYLAND_COMPOSITOR
 #include "wayland/clutter-wayland-compositor.h"
 #endif /* HAVE_CLUTTER_WAYLAND_COMPOSITOR */
diff --git a/clutter/clutter-flow-layout.c b/clutter/clutter-flow-layout.c
index 97524b219..f2a017164 100644
--- a/clutter/clutter-flow-layout.c
+++ b/clutter/clutter-flow-layout.c
@@ -73,12 +73,10 @@
 
 #include <math.h>
 
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-container.h"
-
 #include "clutter-actor.h"
 #include "clutter-animatable.h"
 #include "clutter-child-meta.h"
+#include "clutter-container.h"
 #include "clutter-debug.h"
 #include "clutter-enum-types.h"
 #include "clutter-flow-layout.h"
diff --git a/clutter/clutter-interval.c b/clutter/clutter-interval.c
index 8370c3310..22c12d709 100644
--- a/clutter/clutter-interval.c
+++ b/clutter/clutter-interval.c
@@ -62,8 +62,6 @@
 #include "clutter-private.h"
 #include "clutter-units.h"
 
-#include "deprecated/clutter-fixed.h"
-
 enum
 {
   PROP_0,
diff --git a/clutter/clutter-layout-manager.c b/clutter/clutter-layout-manager.c
index 771077897..99c355fef 100644
--- a/clutter/clutter-layout-manager.c
+++ b/clutter/clutter-layout-manager.c
@@ -160,10 +160,7 @@
 #include <glib-object.h>
 #include <gobject/gvaluecollector.h>
 
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
-#include "deprecated/clutter-container.h"
-#include "deprecated/clutter-alpha.h"
-
+#include "clutter-container.h"
 #include "clutter-debug.h"
 #include "clutter-layout-manager.h"
 #include "clutter-layout-meta.h"
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index 322fcfb1b..f5ac3a293 100644
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -49,12 +49,9 @@
 #include <math.h>
 #include <cairo.h>
 
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
 
 #include "clutter-stage.h"
-#include "deprecated/clutter-stage.h"
-#include "deprecated/clutter-container.h"
 
 #include "clutter-actor-private.h"
 #include "clutter-backend-private.h"
diff --git a/clutter/clutter-util.c b/clutter/clutter-util.c
index 0fc945dd6..41773127c 100644
--- a/clutter/clutter-util.c
+++ b/clutter/clutter-util.c
@@ -43,8 +43,6 @@
 #include "clutter-interval.h"
 #include "clutter-private.h"
 
-#include "deprecated/clutter-util.h"
-
 /*< private >
  * _clutter_gettext:
  * @str: a string to localize