diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 6a256e669..5c761fb0d 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -291,6 +291,7 @@
 #include "clutter-action.h"
 #include "clutter-actor-meta-private.h"
 #include "clutter-animatable.h"
+#include "clutter-behaviour.h"
 #include "clutter-constraint.h"
 #include "clutter-container.h"
 #include "clutter-debug.h"
@@ -307,9 +308,6 @@
 #include "clutter-stage-private.h"
 #include "clutter-units.h"
 
-#undef CLUTTER_DISABLE_DEPRECATED
-#include "clutter-behaviour.h"
-
 typedef struct _ShaderData ShaderData;
 typedef struct _AnchorCoord AnchorCoord;
 
diff --git a/clutter/clutter-behaviour-depth.c b/clutter/clutter-behaviour-depth.c
index 1f22f28aa..eaf630be4 100644
--- a/clutter/clutter-behaviour-depth.c
+++ b/clutter/clutter-behaviour-depth.c
@@ -27,7 +27,6 @@
 #include "config.h"
 #endif
 
-#undef CLUTTER_DISABLE_DEPRECATED
 #include "clutter-behaviour-depth.h"
 
 #include "clutter-enum-types.h"
diff --git a/clutter/clutter-behaviour-depth.h b/clutter/clutter-behaviour-depth.h
index aa701b23e..81f0cd35c 100644
--- a/clutter/clutter-behaviour-depth.h
+++ b/clutter/clutter-behaviour-depth.h
@@ -35,7 +35,7 @@
 
 G_BEGIN_DECLS
 
-#ifndef CLUTTER_DISABLE_DEPRECATED
+#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
 
 #define CLUTTER_TYPE_BEHAVIOUR_DEPTH            (clutter_behaviour_depth_get_type ())
 #define CLUTTER_BEHAVIOUR_DEPTH(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_DEPTH, ClutterBehaviourDepth))
diff --git a/clutter/clutter-behaviour-ellipse.c b/clutter/clutter-behaviour-ellipse.c
index 0414e8f9c..2502215df 100644
--- a/clutter/clutter-behaviour-ellipse.c
+++ b/clutter/clutter-behaviour-ellipse.c
@@ -47,7 +47,6 @@
 #include <math.h>
 #include <stdlib.h>
 
-#undef CLUTTER_DISABLE_DEPRECATED
 #include "clutter-behaviour-ellipse.h"
 
 #include "clutter-debug.h"
diff --git a/clutter/clutter-behaviour-ellipse.h b/clutter/clutter-behaviour-ellipse.h
index 480200918..302d4f200 100644
--- a/clutter/clutter-behaviour-ellipse.h
+++ b/clutter/clutter-behaviour-ellipse.h
@@ -35,7 +35,7 @@
 
 G_BEGIN_DECLS
 
-#ifndef CLUTTER_DISABLE_DEPRECATED
+#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
 
 #define CLUTTER_TYPE_BEHAVIOUR_ELLIPSE (clutter_behaviour_ellipse_get_type ())
 
diff --git a/clutter/clutter-behaviour-opacity.c b/clutter/clutter-behaviour-opacity.c
index eadc63824..46dd8388d 100644
--- a/clutter/clutter-behaviour-opacity.c
+++ b/clutter/clutter-behaviour-opacity.c
@@ -38,7 +38,6 @@
 
 #include <math.h>
 
-#undef CLUTTER_DISABLE_DEPRECATED
 #include "clutter-behaviour-opacity.h"
 
 #include "clutter-private.h"
diff --git a/clutter/clutter-behaviour-opacity.h b/clutter/clutter-behaviour-opacity.h
index f5624e179..aa38ddb9b 100644
--- a/clutter/clutter-behaviour-opacity.h
+++ b/clutter/clutter-behaviour-opacity.h
@@ -35,7 +35,7 @@
 
 G_BEGIN_DECLS
 
-#ifndef CLUTTER_DISABLE_DEPRECATED
+#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
 
 #define CLUTTER_TYPE_BEHAVIOUR_OPACITY (clutter_behaviour_opacity_get_type ())
 
diff --git a/clutter/clutter-behaviour-path.c b/clutter/clutter-behaviour-path.c
index 811e787e4..29ca9ece1 100644
--- a/clutter/clutter-behaviour-path.c
+++ b/clutter/clutter-behaviour-path.c
@@ -64,7 +64,6 @@
 #include "config.h"
 #endif
 
-#undef CLUTTER_DISABLE_DEPRECATED
 #include "clutter-behaviour-path.h"
 
 #include "clutter-bezier.h"
diff --git a/clutter/clutter-behaviour-path.h b/clutter/clutter-behaviour-path.h
index 2c3d92fbb..731aebddf 100644
--- a/clutter/clutter-behaviour-path.h
+++ b/clutter/clutter-behaviour-path.h
@@ -36,7 +36,7 @@
 
 G_BEGIN_DECLS
 
-#ifndef CLUTTER_DISABLE_DEPRECATED
+#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
 
 #define CLUTTER_TYPE_BEHAVIOUR_PATH (clutter_behaviour_path_get_type ())
 
diff --git a/clutter/clutter-behaviour-rotate.c b/clutter/clutter-behaviour-rotate.c
index 5dde385a8..a149c68e7 100644
--- a/clutter/clutter-behaviour-rotate.c
+++ b/clutter/clutter-behaviour-rotate.c
@@ -35,7 +35,6 @@
 #include "config.h"
 #endif
 
-#undef CLUTTER_DISABLE_DEPRECATED
 #include "clutter-behaviour-rotate.h"
 
 #include <math.h>
diff --git a/clutter/clutter-behaviour-rotate.h b/clutter/clutter-behaviour-rotate.h
index 429839724..c30aef9b5 100644
--- a/clutter/clutter-behaviour-rotate.h
+++ b/clutter/clutter-behaviour-rotate.h
@@ -34,7 +34,7 @@
 
 G_BEGIN_DECLS
 
-#ifndef CLUTTER_DISABLE_DEPRECATED
+#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
 
 #define CLUTTER_TYPE_BEHAVIOUR_ROTATE            (clutter_behaviour_rotate_get_type ())
 #define CLUTTER_BEHAVIOUR_ROTATE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_ROTATE, ClutterBehaviourRotate))
diff --git a/clutter/clutter-behaviour-scale.c b/clutter/clutter-behaviour-scale.c
index 5b1679bda..0c0ebc345 100644
--- a/clutter/clutter-behaviour-scale.c
+++ b/clutter/clutter-behaviour-scale.c
@@ -37,7 +37,6 @@
 
 #include <math.h>
 
-#undef CLUTTER_DISABLE_DEPRECATED
 #include "clutter-behaviour-scale.h"
 
 #include "clutter-debug.h"
diff --git a/clutter/clutter-behaviour-scale.h b/clutter/clutter-behaviour-scale.h
index 849d0c044..3671cabf0 100644
--- a/clutter/clutter-behaviour-scale.h
+++ b/clutter/clutter-behaviour-scale.h
@@ -34,7 +34,7 @@
 
 G_BEGIN_DECLS
 
-#ifndef CLUTTER_DISABLE_DEPRECATED
+#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
 
 #define CLUTTER_TYPE_BEHAVIOUR_SCALE            (clutter_behaviour_scale_get_type ())
 #define CLUTTER_BEHAVIOUR_SCALE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BEHAVIOUR_SCALE, ClutterBehaviourScale))
diff --git a/clutter/clutter-behaviour.c b/clutter/clutter-behaviour.c
index 5d56b293b..357151767 100644
--- a/clutter/clutter-behaviour.c
+++ b/clutter/clutter-behaviour.c
@@ -71,7 +71,6 @@
 #include "config.h"
 #endif
 
-#undef CLUTTER_DISABLE_DEPRECATED
 #include "clutter-behaviour.h"
 
 #include "clutter-debug.h"
diff --git a/clutter/clutter-behaviour.h b/clutter/clutter-behaviour.h
index 4d250da15..7f7ddf0b3 100644
--- a/clutter/clutter-behaviour.h
+++ b/clutter/clutter-behaviour.h
@@ -36,7 +36,7 @@
 
 G_BEGIN_DECLS
 
-#ifndef CLUTTER_DISABLE_DEPRECATED
+#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
 
 #define CLUTTER_TYPE_BEHAVIOUR clutter_behaviour_get_type()
 
@@ -159,7 +159,7 @@ void          clutter_behaviour_set_alpha      (ClutterBehaviour            *beh
 gboolean      clutter_behaviour_is_applied     (ClutterBehaviour            *behave,
 						ClutterActor                *actor);
 
-#endif /* CLUTTER_DISABLE_DEPRECATED */
+#endif /* !CLUTTER_DISABLE_DEPRECATED || CLUTTER_COMPILATION */
 
 G_END_DECLS
 
diff --git a/clutter/clutter-frame-source.h b/clutter/clutter-frame-source.h
index 2a5a35ed4..a8a40cc45 100644
--- a/clutter/clutter-frame-source.h
+++ b/clutter/clutter-frame-source.h
@@ -32,7 +32,7 @@
 
 G_BEGIN_DECLS
 
-#ifndef CLUTTER_DISABLE_DEPRECATED
+#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
 
 guint clutter_frame_source_add (guint          fps,
 				GSourceFunc    func,
diff --git a/clutter/clutter-timeout-pool.c b/clutter/clutter-timeout-pool.c
index 43baebca1..540b32143 100644
--- a/clutter/clutter-timeout-pool.c
+++ b/clutter/clutter-timeout-pool.c
@@ -34,7 +34,6 @@
 #include "config.h"
 #endif
 
-#undef CLUTTER_DISABLE_DEPRECATED
 #include "clutter-timeout-pool.h"
 
 #include "clutter-debug.h"
diff --git a/clutter/clutter-timeout-pool.h b/clutter/clutter-timeout-pool.h
index 9204e44d5..23f22122a 100644
--- a/clutter/clutter-timeout-pool.h
+++ b/clutter/clutter-timeout-pool.h
@@ -39,7 +39,7 @@
 
 G_BEGIN_DECLS
 
-#ifndef CLUTTER_DISABLE_DEPRECATED
+#if !defined(CLUTTER_DISABLE_DEPRECATED) || defined(CLUTTER_COMPILATION)
 
 /**
  * ClutterTimeoutPool: (skip)