diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 40b5b112f2..6260fb8cfc 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -89,8 +89,6 @@
       <xi:include href="xml/gtkaboutdialog.xml" />
       <xi:include href="xml/gtkassistant.xml" />
       <xi:include href="xml/gtkoffscreenwindow.xml" />
-      <xi:include href="xml/gtkbubblewindow.xml" />
-      <xi:include href="xml/gtkselectionwindow.xml" />
     </chapter>
 
     <chapter id="DisplayWidgets">
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 228bda49c4..5db1c72c3b 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -7494,54 +7494,3 @@ GTK_COLOR_CHOOSER_DIALOG_GET_CLASS
 GtkColorChooserDialogPrivate
 gtk_color_chooser_dialog_get_type
 </SECTION>
-
-<SECTION>
-<FILE>gtkbubblewindow</FILE>
-<TITLE>GtkBubbleWindow</TITLE>
-GtkBubbleWindow
-gtk_bubble_window_new
-gtk_bubble_window_set_relative_to
-gtk_bubble_window_get_relative_to
-gtk_bubble_window_set_pointing_to
-gtk_bubble_window_get_pointing_to
-gtk_bubble_window_set_position
-gtk_bubble_window_get_position
-gtk_bubble_window_popup
-gtk_bubble_window_popdown
-gtk_bubble_window_grab
-gtk_bubble_window_ungrab
-
-<SUBSECTION Standard>
-GTK_TYPE_BUBBLE_WINDOW
-GTK_BUBBLE_WINDOW
-GTK_BUBBLE_WINDOW_CLASS
-GTK_IS_BUBBLE_WINDOW
-GTK_IS_BUBBLE_WINDOW_CLASS
-GTK_BUBBLE_WINDOW_GET_CLASS
-
-<SUBSECTION Private>
-gtk_bubble_window_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkselectionwindow</FILE>
-<TITLE>GtkSelectionWindow</TITLE>
-GtkSelectionWindow
-gtk_selection_window_new
-gtk_selection_window_set_editable
-gtk_selection_window_get_editable
-gtk_selection_window_set_has_selection
-gtk_selection_window_get_has_selection
-gtk_selection_window_get_toolbar
-
-<SUBSECTION Standard>
-GTK_TYPE_SELECTION_WINDOW
-GTK_SELECTION_WINDOW
-GTK_SELECTION_WINDOW_CLASS
-GTK_IS_SELECTION_WINDOW
-GTK_IS_SELECTION_WINDOW_CLASS
-GTK_SELECTION_WINDOW_GET_CLASS
-
-<SUBSECTION Private>
-gtk_selection_window_get_type
-</SECTION>
diff --git a/docs/reference/gtk/gtk3.types.in b/docs/reference/gtk/gtk3.types.in
index 7abc07d4dd..3f378b3b22 100644
--- a/docs/reference/gtk/gtk3.types.in
+++ b/docs/reference/gtk/gtk3.types.in
@@ -23,7 +23,6 @@ gtk_aspect_frame_get_type
 gtk_assistant_get_type
 gtk_bin_get_type
 gtk_box_get_type
-gtk_bubble_window_get_type
 gtk_builder_get_type
 gtk_buildable_get_type
 gtk_button_box_get_type
@@ -147,7 +146,6 @@ gtk_scrollable_get_type
 gtk_scrollbar_get_type
 gtk_scrolled_window_get_type
 gtk_search_entry_get_type
-gtk_selection_window_get_type
 gtk_separator_get_type
 gtk_separator_menu_item_get_type
 gtk_separator_tool_item_get_type
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index f9797c5d4f..14feeacdd3 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -202,7 +202,6 @@ gtk_public_h_sources = 		\
 	gtkbindings.h		\
 	gtkborder.h		\
 	gtkbox.h		\
-	gtkbubblewindow.h	\
 	gtkbuilder.h		\
 	gtkbuildable.h		\
 	gtkbutton.h		\
@@ -320,7 +319,6 @@ gtk_public_h_sources = 		\
 	gtkscrolledwindow.h	\
 	gtksearchentry.h	\
 	gtkselection.h		\
-	gtkselectionwindow.h	\
 	gtkseparator.h		\
 	gtkseparatormenuitem.h	\
 	gtkseparatortoolitem.h	\
@@ -424,6 +422,7 @@ gtk_private_h_sources =		\
 	gtkbitmaskprivateimpl.h	\
 	gtkborderimageprivate.h \
 	gtkboxprivate.h         \
+	gtkbubblewindowprivate.h	\
 	gtkbuilderprivate.h	\
 	gtkbuttonprivate.h	\
 	gtkcairoblurprivate.h	\
@@ -524,6 +523,7 @@ gtk_private_h_sources =		\
 	gtksearchengine.h	\
 	gtksearchenginesimple.h	\
 	gtkselectionprivate.h	\
+	gtkselectionwindowprivate.h	\
 	gtksettingsprivate.h	\
 	gtksizegroup-private.h	\
 	gtksizerequestcacheprivate.h	\
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 9c98b41378..e95494f0fe 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -53,7 +53,6 @@
 #include <gtk/gtkbindings.h>
 #include <gtk/gtkborder.h>
 #include <gtk/gtkbox.h>
-#include <gtk/gtkbubblewindow.h>
 #include <gtk/gtkbuildable.h>
 #include <gtk/gtkbuilder.h>
 #include <gtk/gtkbutton.h>
@@ -169,7 +168,6 @@
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtksearchentry.h>
 #include <gtk/gtkselection.h>
-#include <gtk/gtkselectionwindow.h>
 #include <gtk/gtkseparator.h>
 #include <gtk/gtkseparatormenuitem.h>
 #include <gtk/gtkseparatortoolitem.h>
diff --git a/gtk/gtkbubblewindow.c b/gtk/gtkbubblewindow.c
index 2200d8f9c6..aee3dc7705 100644
--- a/gtk/gtkbubblewindow.c
+++ b/gtk/gtkbubblewindow.c
@@ -39,7 +39,7 @@
 #include "config.h"
 #include <gdk/gdk.h>
 #include <cairo-gobject.h>
-#include "gtkbubblewindow.h"
+#include "gtkbubblewindowprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkmain.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkbubblewindow.h b/gtk/gtkbubblewindowprivate.h
similarity index 96%
rename from gtk/gtkbubblewindow.h
rename to gtk/gtkbubblewindowprivate.h
index 3d2eceb8d2..47fd038df4 100644
--- a/gtk/gtkbubblewindow.h
+++ b/gtk/gtkbubblewindowprivate.h
@@ -18,10 +18,6 @@
 #ifndef __GTK_BUBBLE_WINDOW_H__
 #define __GTK_BUBBLE_WINDOW_H__
 
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #include <gtk/gtkwindow.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index a1a5387d5f..a5c13e2c7a 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -66,7 +66,7 @@
 #include "gtkwidgetprivate.h"
 #include "gtkstylecontextprivate.h"
 #include "gtktexthandleprivate.h"
-#include "gtkselectionwindow.h"
+#include "gtkselectionwindowprivate.h"
 
 #include "a11y/gtkentryaccessible.h"
 
diff --git a/gtk/gtkselectionwindow.c b/gtk/gtkselectionwindow.c
index 1e18f43366..d1591b57f7 100644
--- a/gtk/gtkselectionwindow.c
+++ b/gtk/gtkselectionwindow.c
@@ -27,7 +27,7 @@
  */
 
 #include "config.h"
-#include "gtkselectionwindow.h"
+#include "gtkselectionwindowprivate.h"
 #include "gtkactiongroup.h"
 #include "gtkuimanager.h"
 #include "gtkclipboard.h"
diff --git a/gtk/gtkselectionwindow.h b/gtk/gtkselectionwindowprivate.h
similarity index 98%
rename from gtk/gtkselectionwindow.h
rename to gtk/gtkselectionwindowprivate.h
index bce80e1f9f..bde774ddcf 100644
--- a/gtk/gtkselectionwindow.h
+++ b/gtk/gtkselectionwindowprivate.h
@@ -22,7 +22,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbubblewindow.h>
+#include "gtkbubblewindowprivate.h"
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 6986d0b981..1e3b71dde9 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -53,7 +53,7 @@
 #include "gtktexthandleprivate.h"
 #include "gtkstylecontextprivate.h"
 #include "gtkcssstylepropertyprivate.h"
-#include "gtkselectionwindow.h"
+#include "gtkselectionwindowprivate.h"
 
 #include "a11y/gtktextviewaccessibleprivate.h"