More include cleanups

13 files changed, 14 insertions, 20 deletions

diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index dd21f4ecbe..18f59512a3 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -37,7 +37,7 @@
 #include "gtkbbox.h"
 #include "gtkdialog.h"
 #include "gtkgrid.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
 #include "gtklinkbutton.h"
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 6986db25d8..0b82c2240d 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -28,7 +28,7 @@
 #include "gtkcellview.h"
 #include "gtkeventbox.h"
 #include "gtkframe.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtkliststore.h"
 #include "gtkmain.h"
 #include "gtkmenuprivate.h"
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 2e863a89c3..0d195d397f 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -31,7 +31,7 @@
 #include "gtkfontbutton.h"
 
 #include "gtkmain.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtklabel.h"
 #include "gtkfontchooserdialog.h"
 #include "gtkimage.h"
diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c
index 648bf8f18d..70d586a847 100644
--- a/gtk/gtkfontchooser.c
+++ b/gtk/gtkfontchooser.c
@@ -29,15 +29,14 @@
 #include "gtkcellrenderertext.h"
 #include "gtkentry.h"
 #include "gtkframe.h"
-#include "gtkhbbox.h"
-#include "gtkhbox.h"
+#include "gtkbbox.h"
+#include "gtkbox.h"
 #include "gtklabel.h"
 #include "gtkliststore.h"
 #include "gtkstock.h"
 #include "gtktextview.h"
 #include "gtktreeselection.h"
 #include "gtktreeview.h"
-#include "gtkbox.h"
 #include "gtkscrolledwindow.h"
 #include "gtkintl.h"
 #include "gtkaccessible.h"
@@ -45,7 +44,6 @@
 #include "gtkprivate.h"
 #include "gtkalignment.h"
 #include "gtkscale.h"
-#include "gtkbox.h"
 #include "gtkspinbutton.h"
 #include "gtknotebook.h"
 #include "gtkwidget.h"
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index c50abda9dd..454336b3c8 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -106,7 +106,7 @@
 #include "gtkmenushellprivate.h"
 #include "gtktearoffmenuitem.h"
 #include "gtkwindow.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtkscrollbar.h"
 #include "gtksettings.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 42eb301b91..2d022cc00e 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -32,10 +32,9 @@
 #include "gtkmountoperationprivate.h"
 #include "gtkbox.h"
 #include "gtkentry.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtkintl.h"
 #include "gtklabel.h"
-#include "gtkbox.h"
 #include "gtkmessagedialog.h"
 #include "gtkmountoperation.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 8f467b2701..d5d0f3b6fc 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -32,7 +32,7 @@
 #include "gtkicontheme.h"
 #include "gtkiconfactory.h"
 #include "gtklabel.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 
diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
index c56b73e7ef..bd3157ad19 100644
--- a/gtk/gtkscalebutton.c
+++ b/gtk/gtkscalebutton.c
@@ -51,7 +51,7 @@
 #include "gtkscale.h"
 #include "gtkscalebutton.h"
 #include "gtkstock.h"
-#include "gtkvbox.h"
+#include "gtkbox.h"
 #include "gtkwindow.h"
 #include "gtktypebuiltins.h"
 #include "gtkintl.h"
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 9bbbe94f5c..b753f39f16 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -39,7 +39,6 @@
 
 #include "gtkarrow.h"
 #include "gtkbindings.h"
-#include "gtkhbox.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
 #include "gtkmainprivate.h"
@@ -52,7 +51,7 @@
 #include "gtkseparatortoolitem.h"
 #include "gtkstock.h"
 #include "gtktoolshell.h"
-#include "gtkvbox.h"
+#include "gtkbox.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtktypebuiltins.h"
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index f78572985a..8ee5fdf0e3 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -23,13 +23,12 @@
 #include "config.h"
 #include "gtktoolbutton.h"
 #include "gtkbutton.h"
-#include "gtkhbox.h"
 #include "gtkiconfactory.h"
 #include "gtkimage.h"
 #include "gtkimagemenuitem.h"
 #include "gtklabel.h"
 #include "gtkstock.h"
-#include "gtkvbox.h"
+#include "gtkbox.h"
 #include "gtkintl.h"
 #include "gtktoolbar.h"
 #include "gtkactivatable.h"
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 00aa6bf41d..f65e08df4c 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -31,7 +31,7 @@
 #include "gtkmain.h"
 #include "gtklabel.h"
 #include "gtkimage.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtksizerequest.h"
 #include "gtkwindowprivate.h"
 
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 36d1bb258c..b8337706be 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -33,8 +33,7 @@
 #include "gtkbuildable.h"
 #include "gtkbutton.h"
 #include "gtklabel.h"
-#include "gtkhbox.h"
-#include "gtkvbox.h"
+#include "gtkbox.h"
 #include "gtkarrow.h"
 #include "gtkintl.h"
 #include "gtkbindings.h"
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 11f86cd1d6..af79da7a6d 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -29,7 +29,7 @@
 #include "gtkbutton.h"
 #include "gtkalignment.h"
 #include "gtklabel.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
 #include "gtkmarshalers.h"
 #include "gtkarrow.h"
 #include "gtkcellareacontext.h"