diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index f7bed5b57c..e7e6a4dc65 100644
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -37,13 +37,6 @@
 
 G_BEGIN_DECLS
 
-/*
- * This is the PUBLIC representation of a text buffer.
- * GtkTextBTree is the PRIVATE internal representation of it.
- */
-
-typedef struct _GtkTextBTree GtkTextBTree;
-
 #define GTK_TYPE_TEXT_BUFFER            (gtk_text_buffer_get_type ())
 #define GTK_TEXT_BUFFER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBuffer))
 #define GTK_TEXT_BUFFER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_BUFFER, GtkTextBufferClass))
diff --git a/gtk/gtktextbufferprivate.h b/gtk/gtktextbufferprivate.h
index 87b2741cfe..b67e22a38e 100644
--- a/gtk/gtktextbufferprivate.h
+++ b/gtk/gtktextbufferprivate.h
@@ -19,10 +19,10 @@
 #define __GTK_TEXT_BUFFER_PRIVATE_H__
 
 #include <gtk/gtktextbuffer.h>
+#include "gtktexttypes.h"
 
 G_BEGIN_DECLS
 
-
 void            _gtk_text_buffer_spew                  (GtkTextBuffer      *buffer);
 
 GtkTextBTree*   _gtk_text_buffer_get_btree             (GtkTextBuffer      *buffer);
diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h
index fdb7f710f7..1d799ee952 100644
--- a/gtk/gtktexttypes.h
+++ b/gtk/gtktexttypes.h
@@ -30,6 +30,13 @@
 
 G_BEGIN_DECLS
 
+/*
+ * This is the PUBLIC representation of a text buffer.
+ * GtkTextBTree is the PRIVATE internal representation of it.
+ */
+
+typedef struct _GtkTextBTree GtkTextBTree;
+
 typedef struct _GtkTextCounter GtkTextCounter;
 typedef struct _GtkTextLineSegment GtkTextLineSegment;
 typedef struct _GtkTextLineSegmentClass GtkTextLineSegmentClass;