diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
index 4372db562..28381065f 100644
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -42,7 +42,7 @@ IGNORE_HFILES=			\
 	gnulib			\
 	pcre			\
 	update-pcre		\
-	gbuffer.h		\
+	gbufferprivate.h	\
 	gvariant-internal.h	\
 	gvariant-serialiser.h	\
 	gvariant-core.h		\
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 7d333a812..becfcaa75 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -122,7 +122,7 @@ libglib_2_0_la_SOURCES = 	\
 	gbookmarkfile.c 	\
 	gbsearcharray.h		\
 	gbuffer.c		\
-	gbuffer.h		\
+	gbufferprivate.h	\
 	gcache.c		\
 	gchecksum.c		\
 	gcompletion.c		\
diff --git a/glib/gbuffer.c b/glib/gbuffer.c
index f7e30441c..d4dc21b80 100644
--- a/glib/gbuffer.c
+++ b/glib/gbuffer.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "gbuffer.h"
+#include "gbufferprivate.h"
 
 #include <glib/gstrfuncs.h>
 #include <glib/gatomic.h>
diff --git a/glib/gbuffer.h b/glib/gbufferprivate.h
similarity index 100%
rename from glib/gbuffer.h
rename to glib/gbufferprivate.h
diff --git a/glib/gmappedfile.c b/glib/gmappedfile.c
index b78651729..48081dcb9 100644
--- a/glib/gmappedfile.c
+++ b/glib/gmappedfile.c
@@ -52,7 +52,7 @@
 #include "gstdio.h"
 #include "gstrfuncs.h"
 #include "gatomic.h"
-#include "gbuffer.h"
+#include "gbufferprivate.h"
 
 #include "glibintl.h"
 
diff --git a/glib/gtimezone.c b/glib/gtimezone.c
index 0d9d6f742..9b2fb07fa 100644
--- a/glib/gtimezone.c
+++ b/glib/gtimezone.c
@@ -33,7 +33,7 @@
 #include "gstrfuncs.h"
 #include "ghash.h"
 #include "gthread.h"
-#include "gbuffer.h"
+#include "gbufferprivate.h"
 
 /**
  * SECTION:timezone
diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c
index d2bd576d2..211156126 100644
--- a/glib/gvariant-core.c
+++ b/glib/gvariant-core.c
@@ -24,7 +24,7 @@
 #include <glib/gtestutils.h>
 #include <glib/gbitlock.h>
 #include <glib/gatomic.h>
-#include <glib/gbuffer.h>
+#include <glib/gbufferprivate.h>
 #include <glib/gslice.h>
 #include <glib/gmem.h>
 #include <string.h>
diff --git a/glib/gvariant-core.h b/glib/gvariant-core.h
index 33c0ef313..a31212ee2 100644
--- a/glib/gvariant-core.h
+++ b/glib/gvariant-core.h
@@ -23,7 +23,7 @@
 
 #include <glib/gvarianttypeinfo.h>
 #include <glib/gvariant.h>
-#include <glib/gbuffer.h>
+#include <glib/gbufferprivate.h>
 
 /* gvariant-core.c */
 G_GNUC_INTERNAL