diff --git a/gtk/a11y/gtklockbuttonaccessible.h b/gtk/a11y/gtklockbuttonaccessible.h
index 90629a1bb3..d6b4510c7d 100644
--- a/gtk/a11y/gtklockbuttonaccessible.h
+++ b/gtk/a11y/gtklockbuttonaccessible.h
@@ -22,7 +22,6 @@
 #error "Only <gtk/gtk-a11y.h> can be included directly."
 #endif
 
-#include <gtk/gtk.h>
 #include <gtk/a11y/gtkbuttonaccessible.h>
 
 G_BEGIN_DECLS
diff --git a/gtk/a11y/gtklockbuttonaccessibleprivate.h b/gtk/a11y/gtklockbuttonaccessibleprivate.h
index 80194c1edc..6ba82e425a 100644
--- a/gtk/a11y/gtklockbuttonaccessibleprivate.h
+++ b/gtk/a11y/gtklockbuttonaccessibleprivate.h
@@ -20,6 +20,8 @@
 
 #include <gtk/a11y/gtklockbuttonaccessible.h>
 
+#include <gtk/gtklockbutton.h>
+
 G_BEGIN_DECLS
 
 void  _gtk_lock_button_accessible_name_changed (GtkLockButton *lockbutton);
diff --git a/gtk/gtklockbutton.c b/gtk/gtklockbutton.c
index e6f89d4174..e8e3642eb6 100644
--- a/gtk/gtklockbutton.c
+++ b/gtk/gtklockbutton.c
@@ -19,11 +19,15 @@
 #include "config.h"
 
 #include "gtklockbuttonprivate.h"
+
 #include "gtkbox.h"
 #include "gtkimage.h"
+#include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtksizegroup.h"
-#include "gtkintl.h"
+#include "gtkstack.h"
+#include "gtkstylecontext.h"
+
 #include "a11y/gtklockbuttonaccessibleprivate.h"
 
 /**