diff --git a/gtk/gtkbubblewindow.c b/gtk/gtkbubblewindow.c
index 08c735d9e6..2200d8f9c6 100644
--- a/gtk/gtkbubblewindow.c
+++ b/gtk/gtkbubblewindow.c
@@ -40,6 +40,8 @@
 #include <gdk/gdk.h>
 #include <cairo-gobject.h>
 #include "gtkbubblewindow.h"
+#include "gtktypebuiltins.h"
+#include "gtkmain.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
diff --git a/gtk/gtkbubblewindow.h b/gtk/gtkbubblewindow.h
index 7cf1fa0b62..3d2eceb8d2 100644
--- a/gtk/gtkbubblewindow.h
+++ b/gtk/gtkbubblewindow.h
@@ -22,7 +22,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#include <gtk/gtk.h>
+#include <gtk/gtkwindow.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtkselectionwindow.c b/gtk/gtkselectionwindow.c
index 62d2a5a0cf..1e18f43366 100644
--- a/gtk/gtkselectionwindow.c
+++ b/gtk/gtkselectionwindow.c
@@ -28,6 +28,10 @@
 
 #include "config.h"
 #include "gtkselectionwindow.h"
+#include "gtkactiongroup.h"
+#include "gtkuimanager.h"
+#include "gtkclipboard.h"
+#include "gtktoolbar.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"