diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h
index 1dbbc7c4d..b079588d2 100644
--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -98,8 +98,6 @@
 #include "clutter/clutter-stage.h"
 #include "clutter/clutter-stage-view.h"
 #include "clutter/clutter-tap-action.h"
-#include "clutter/clutter-text-buffer.h"
-#include "clutter/clutter-text.h"
 #include "clutter/clutter-texture-content.h"
 #include "clutter/clutter-timeline.h"
 #include "clutter/clutter-transition-group.h"
@@ -107,6 +105,8 @@
 #include "clutter/clutter-virtual-input-device.h"
 #include "clutter/clutter-zoom-action.h"
 
+#include "clutter/pango/clutter-text.h"
+#include "clutter/pango/clutter-text-buffer.h"
 #include "clutter/pango/clutter-text-node.h"
 
 #undef __CLUTTER_H_INSIDE__
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 12abbff90..20c2d0ce3 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -2,6 +2,8 @@ clutter_clutter_includesubdir = clutter_includesubdir / 'clutter'
 clutter_clutter_includedir = clutter_includedir / 'clutter'
 
 clutter_headers = [
+  'pango/clutter-text.h',
+  'pango/clutter-text-buffer.h',
   'pango/clutter-text-node.h',
   'clutter.h',
   'clutter-action.h',
@@ -71,8 +73,6 @@ clutter_headers = [
   'clutter-stage.h',
   'clutter-stage-view.h',
   'clutter-tap-action.h',
-  'clutter-text.h',
-  'clutter-text-buffer.h',
   'clutter-texture-content.h',
   'clutter-timeline.h',
   'clutter-transition-group.h',
@@ -87,6 +87,9 @@ clutter_sources = [
   'pango/clutter-pango-glyph-cache.c',
   'pango/clutter-pango-pipeline-cache.c',
   'pango/clutter-pango-render.c',
+  'pango/clutter-text.c',
+  'pango/clutter-text-accessible.c',
+  'pango/clutter-text-buffer.c',
   'pango/clutter-text-node.c',
   'clutter-accessibility.c',
   'clutter-action.c',
@@ -169,9 +172,6 @@ clutter_sources = [
   'clutter-stage-view.c',
   'clutter-stage-window.c',
   'clutter-tap-action.c',
-  'clutter-text-accessible.c',
-  'clutter-text.c',
-  'clutter-text-buffer.c',
   'clutter-texture-content.c',
   'clutter-transition-group.c',
   'clutter-transition.c',
@@ -186,6 +186,7 @@ clutter_private_headers = [
   'pango/clutter-pango-glyph-cache.h',
   'pango/clutter-pango-pipeline-cache.h',
   'pango/clutter-pango-private.h',
+  'pango/clutter-text-accessible-private.h',
   'clutter-accessibility-private.h',
   'clutter-actor-meta-private.h',
   'clutter-actor-private.h',
@@ -220,7 +221,6 @@ clutter_private_headers = [
   'clutter-stage-private.h',
   'clutter-stage-view-private.h',
   'clutter-stage-window.h',
-  'clutter-text-accessible-private.h',
   'clutter-timeline-private.h',
 ]
 
diff --git a/clutter/clutter/clutter-text-accessible-private.h b/clutter/clutter/pango/clutter-text-accessible-private.h
similarity index 100%
rename from clutter/clutter/clutter-text-accessible-private.h
rename to clutter/clutter/pango/clutter-text-accessible-private.h
diff --git a/clutter/clutter/clutter-text-accessible.c b/clutter/clutter/pango/clutter-text-accessible.c
similarity index 99%
rename from clutter/clutter/clutter-text-accessible.c
rename to clutter/clutter/pango/clutter-text-accessible.c
index 68bee0614..e93da8b54 100644
--- a/clutter/clutter/clutter-text-accessible.c
+++ b/clutter/clutter/pango/clutter-text-accessible.c
@@ -37,11 +37,11 @@
 
 #include "config.h"
 
-#include "clutter/clutter-text-accessible-private.h"
+#include "clutter/pango/clutter-text-accessible-private.h"
 
 #include "clutter/clutter-actor-private.h"
 #include "clutter/clutter-main.h"
-#include "clutter/clutter-text.h"
+#include "clutter/pango/clutter-text.h"
 
 static void cally_text_finalize   (GObject *obj);
 
diff --git a/clutter/clutter/clutter-text-buffer.c b/clutter/clutter/pango/clutter-text-buffer.c
similarity index 99%
rename from clutter/clutter/clutter-text-buffer.c
rename to clutter/clutter/pango/clutter-text-buffer.c
index 1d6818da4..f46fa4e1b 100644
--- a/clutter/clutter/clutter-text-buffer.c
+++ b/clutter/clutter/pango/clutter-text-buffer.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "clutter/clutter-text-buffer.h"
+#include "clutter/pango/clutter-text-buffer.h"
 #include "clutter/clutter-marshal.h"
 #include "clutter/clutter-private.h"
 
@@ -27,7 +27,7 @@
 
 /**
  * ClutterTextBuffer:
- * 
+ *
  * Text buffer for [class@Text]
  *
  * The #ClutterTextBuffer class contains the actual text displayed in a
@@ -556,8 +556,8 @@ clutter_text_buffer_set_text (ClutterTextBuffer *buffer,
  *   (other than the maximum length of entries.) The value passed in will
  *   be clamped to the range [ 0, %CLUTTER_TEXT_BUFFER_MAX_SIZE ].
  *
- * Sets the maximum allowed length of the contents of the buffer. 
- * 
+ * Sets the maximum allowed length of the contents of the buffer.
+ *
  * If the current contents are longer than the given length,
  * then they will be truncated to fit.
  **/
diff --git a/clutter/clutter/clutter-text-buffer.h b/clutter/clutter/pango/clutter-text-buffer.h
similarity index 100%
rename from clutter/clutter/clutter-text-buffer.h
rename to clutter/clutter/pango/clutter-text-buffer.h
diff --git a/clutter/clutter/clutter-text.c b/clutter/clutter/pango/clutter-text.c
similarity index 99%
rename from clutter/clutter/clutter-text.c
rename to clutter/clutter/pango/clutter-text.c
index afa6a2c2f..bdcdcacfe 100644
--- a/clutter/clutter/clutter-text.c
+++ b/clutter/clutter/pango/clutter-text.c
@@ -44,10 +44,11 @@
 #include <string.h>
 #include <math.h>
 
-#include "clutter/clutter-text.h"
+#include "clutter/pango/clutter-text.h"
 
 #include "clutter/pango/clutter-pango-private.h"
-#include "clutter/clutter-text-accessible-private.h"
+#include "clutter/pango/clutter-text-accessible-private.h"
+#include "clutter/pango/clutter-text-buffer.h"
 #include "clutter/clutter-actor-private.h"
 #include "clutter/clutter-animatable.h"
 #include "clutter/clutter-backend-private.h"
@@ -59,7 +60,6 @@
 #include "clutter/clutter-marshal.h"
 #include "clutter/clutter-private.h"
 #include "clutter/clutter-property-transition.h"
-#include "clutter/clutter-text-buffer.h"
 #include "clutter/clutter-paint-volume-private.h"
 #include "clutter/clutter-input-focus.h"
 
diff --git a/clutter/clutter/clutter-text.h b/clutter/clutter/pango/clutter-text.h
similarity index 99%
rename from clutter/clutter/clutter-text.h
rename to clutter/clutter/pango/clutter-text.h
index a6ea64383..9e5201bc6 100644
--- a/clutter/clutter/clutter-text.h
+++ b/clutter/clutter/pango/clutter-text.h
@@ -29,7 +29,7 @@
 #endif
 
 #include "clutter/clutter-actor.h"
-#include "clutter/clutter-text-buffer.h"
+#include "clutter/pango/clutter-text-buffer.h"
 #include <pango/pango.h>
 
 G_BEGIN_DECLS