21 files changed, 31 insertions, 13 deletions
diff --git a/gtk/deprecated/gtkrc.c b/gtk/deprecated/gtkrc.c
index 1907fe4025..2cb8005b50 100644
--- a/gtk/deprecated/gtkrc.c
+++ b/gtk/deprecated/gtkrc.c
@@ -54,6 +54,7 @@
 #include "gtkmodulesprivate.h"
 #include "gtkprivate.h"
 #include "gtksettingsprivate.h"
+#include "gtkwidgetpath.h"
 #include "gtkwindow.h"
 
 #ifdef G_OS_WIN32
diff --git a/gtk/deprecated/gtkstyle.c b/gtk/deprecated/gtkstyle.c
index 0bc61484f1..526636890c 100644
--- a/gtk/deprecated/gtkstyle.c
+++ b/gtk/deprecated/gtkstyle.c
@@ -43,6 +43,7 @@
 #include "gtkdebug.h"
 #include "gtkspinner.h"
 #include "gtkborder.h"
+#include "gtkwidgetpath.h"
 
 /**
  * SECTION:gtkstyle
diff --git a/gtk/deprecated/gtkstyle.h b/gtk/deprecated/gtkstyle.h
index a711308818..1dd7100969 100644
--- a/gtk/deprecated/gtkstyle.h
+++ b/gtk/deprecated/gtkstyle.h
@@ -32,7 +32,7 @@
 
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
-#include <gtk/gtkwidgetpath.h>
+#include <gtk/gtktypes.h>
 
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 1705645a53..96bc318694 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -79,11 +79,12 @@
 
 #include "gtkbox.h"
 #include "gtkboxprivate.h"
+#include "gtkintl.h"
 #include "gtkorientable.h"
-#include "gtksizerequest.h"
-#include "gtktypebuiltins.h"
 #include "gtkprivate.h"
-#include "gtkintl.h"
+#include "gtktypebuiltins.h"
+#include "gtksizerequest.h"
+#include "gtkwidgetpath.h"
 #include "a11y/gtkboxaccessible.h"
 
 
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 95c2deca5e..6cbcb39192 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -40,6 +40,7 @@
 #include "gtktogglebutton.h"
 #include "gtktreeselection.h"
 #include "gtkseparator.h"
+#include "gtkwidgetpath.h"
 #include "gtkwindow.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 4d5559575f..275ee28c1f 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -46,6 +46,7 @@
 #include "gtkwindow.h"
 #include "gtkassistant.h"
 #include "gtkintl.h"
+#include "gtkwidgetpath.h"
 #include "a11y/gtkcontaineraccessible.h"
 
 /**
diff --git a/gtk/gtkcssselector.c b/gtk/gtkcssselector.c
index af68083762..2f7735d8eb 100644
--- a/gtk/gtkcssselector.c
+++ b/gtk/gtkcssselector.c
@@ -23,6 +23,7 @@
 
 #include "gtkcssprovider.h"
 #include "gtkstylecontextprivate.h"
+#include "gtkwidgetpath.h"
 
 typedef struct _GtkCssSelectorClass GtkCssSelectorClass;
 
diff --git a/gtk/gtkcssselectorprivate.h b/gtk/gtkcssselectorprivate.h
index 149a90cc45..c0ff428e0a 100644
--- a/gtk/gtkcssselectorprivate.h
+++ b/gtk/gtkcssselectorprivate.h
@@ -19,7 +19,7 @@
 #define __GTK_CSS_SELECTOR_PRIVATE_H__
 
 #include <gtk/gtkenums.h>
-#include <gtk/gtkwidgetpath.h>
+#include <gtk/gtktypes.h>
 #include "gtk/gtkcssparserprivate.h"
 
 G_BEGIN_DECLS
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 23a89d79d4..03e0b2a6f7 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -30,6 +30,7 @@
 #include "gtktypebuiltins.h"
 #include "gtkintl.h"
 #include "gtkbuildable.h"
+#include "gtkwidgetpath.h"
 
 #include "a11y/gtkframeaccessible.h"
 
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 4fe6973bd6..953b0e4a62 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -108,6 +108,7 @@
 #include "gtkscrollbar.h"
 #include "gtksettings.h"
 #include "gtkprivate.h"
+#include "gtkwidgetpath.h"
 #include "gtkwidgetprivate.h"
 #include "gtkdnd.h"
 #include "gtkintl.h"
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index ac8038cb79..5ebdf707a7 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -41,6 +41,7 @@
 #include "gtkdnd.h"
 #include "gtkbuildable.h"
 #include "gtktypebuiltins.h"
+#include "gtkwidgetpath.h"
 #include "a11y/gtknotebookaccessible.h"
 
 
diff --git a/gtk/gtknumerableicon.c b/gtk/gtknumerableicon.c
index d8573910d4..3a1a6fad1c 100644
--- a/gtk/gtknumerableicon.c
+++ b/gtk/gtknumerableicon.c
@@ -45,6 +45,7 @@
 #include "gtkicontheme.h"
 #include "gtkintl.h"
 #include "gtkwidget.h"
+#include "gtkwidgetpath.h"
 #include "gtkwindow.h"
 
 #include <gdk/gdk.h>
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 101f884f78..3c290bc5e1 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -34,6 +34,7 @@
 #include "gtkmarshalers.h"
 #include "gtksettings.h"
 #include "gtktogglebutton.h"
+#include "gtkwidgetpath.h"
 
 
 enum {
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 69a77e3c94..5c7dbc19de 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -39,12 +39,13 @@
 #include "gtkbindings.h"
 #include "gtkentryprivate.h"
 #include "gtkicontheme.h"
+#include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gtksettings.h"
 #include "gtkstock.h"
-#include "gtkprivate.h"
-#include "gtkintl.h"
 #include "gtktypebuiltins.h"
+#include "gtkwidgetpath.h"
 
 #include "a11y/gtkspinbuttonaccessible.h"
 
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index ccf2315a05..e0c8ebfe82 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -34,6 +34,7 @@
 #include "gtkanimationdescription.h"
 #include "gtktimeline.h"
 #include "gtkiconfactory.h"
+#include "gtkwidgetpath.h"
 #include "gtkwidgetprivate.h"
 #include "gtkstyleproviderprivate.h"
 #include "gtksettings.h"
diff --git a/gtk/gtkstyleprovider.c b/gtk/gtkstyleprovider.c
index 80f411c3a2..23575561b2 100644
--- a/gtk/gtkstyleprovider.c
+++ b/gtk/gtkstyleprovider.c
@@ -17,9 +17,11 @@
 
 #include "config.h"
 
-#include "gtkprivate.h"
 #include "gtkstyleprovider.h"
+
 #include "gtkintl.h"
+#include "gtkprivate.h"
+#include "gtkwidgetpath.h"
 
 /**
  * SECTION:gtkstyleprovider
diff --git a/gtk/gtkstyleprovider.h b/gtk/gtkstyleprovider.h
index e8ac3b2bdb..9573dc291b 100644
--- a/gtk/gtkstyleprovider.h
+++ b/gtk/gtkstyleprovider.h
@@ -23,10 +23,10 @@
 #define __GTK_STYLE_PROVIDER_H__
 
 #include <glib-object.h>
-#include <gtk/gtkwidgetpath.h>
+#include <gtk/gtkenums.h>
 #include <gtk/gtkiconfactory.h>
 #include <gtk/gtkstyleproperties.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtkstyleproviderprivate.h b/gtk/gtkstyleproviderprivate.h
index d53a463d7f..ac7ac3d806 100644
--- a/gtk/gtkstyleproviderprivate.h
+++ b/gtk/gtkstyleproviderprivate.h
@@ -22,7 +22,7 @@
 #include "gtk/gtkcsslookupprivate.h"
 #include <gtk/gtkenums.h>
 #include <gtk/gtksymboliccolor.h>
-#include <gtk/gtkwidgetpath.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtkthemingengine.h b/gtk/gtkthemingengine.h
index d0e76e98e1..aa7e05388c 100644
--- a/gtk/gtkthemingengine.h
+++ b/gtk/gtkthemingengine.h
@@ -25,9 +25,10 @@
 #include <glib-object.h>
 #include <cairo.h>
 
-#include <gtk/gtkstylecontext.h>
-#include <gtk/gtkwidgetpath.h>
+#include <gtk/gtkborder.h>
 #include <gtk/gtkenums.h>
+#include <gtk/gtkstyleproperties.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index de5603c622..3974810f29 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -54,6 +54,7 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtktypebuiltins.h"
+#include "gtkwidgetpath.h"
 
 
 /**
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 97d5cb6a8e..7bca6a365e 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -51,6 +51,7 @@
 #include "gtktypebuiltins.h"
 #include "gtkmain.h"
 #include "gtksettings.h"
+#include "gtkwidgetpath.h"
 #include "a11y/gtktreeviewaccessible.h"