diff --git a/gtk/gtk.h b/gtk/gtk.h
index e95494f0fe..9c98b41378 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -53,6 +53,7 @@
 #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>
@@ -168,6 +169,7 @@
 #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.h b/gtk/gtkbubblewindow.h
index 5c0a9fd79d..7cf1fa0b62 100644
--- a/gtk/gtkbubblewindow.h
+++ b/gtk/gtkbubblewindow.h
@@ -18,6 +18,10 @@
 #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/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkselectionwindow.h b/gtk/gtkselectionwindow.h
index edc35e15d6..bce80e1f9f 100644
--- a/gtk/gtkselectionwindow.h
+++ b/gtk/gtkselectionwindow.h
@@ -18,6 +18,10 @@
 #ifndef __GTK_SELECTION_WINDOW_H__
 #define __GTK_SELECTION_WINDOW_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkbubblewindow.h>
 
 G_BEGIN_DECLS