diff --git a/gtk/gtktypes.h b/gtk/gtktypes.h
index 24a64f0fac..67554557b9 100644
--- a/gtk/gtktypes.h
+++ b/gtk/gtktypes.h
@@ -33,6 +33,13 @@
 
 G_BEGIN_DECLS
 
+typedef struct _GtkClipboard	       GtkClipboard;
+typedef struct _GtkRequisition	       GtkRequisition;
+typedef struct _GtkSelectionData       GtkSelectionData;
+typedef struct _GtkTooltip             GtkTooltip;
+typedef struct _GtkWidget              GtkWidget;
+typedef struct _GtkWidgetPath          GtkWidgetPath;
+typedef struct _GtkWindow              GtkWindow;
 
 G_END_DECLS
 
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 5a4cdbcbff..c234d4d8dd 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -35,7 +35,7 @@
 #include <gtk/gtkborder.h>
 #include <gtk/gtksettings.h>
 #include <gtk/gtkstylecontext.h>
-#include <gtk/gtkwidgetpath.h>
+#include <gtk/gtktypes.h>
 #include <atk/atk.h>
 
 G_BEGIN_DECLS
@@ -59,17 +59,10 @@ typedef enum
 
 #define GTK_TYPE_REQUISITION              (gtk_requisition_get_type ())
 
-/* forward declaration to avoid excessive includes (and concurrent includes)
- */
-typedef struct _GtkRequisition	       GtkRequisition;
-typedef struct _GtkSelectionData       GtkSelectionData;
 typedef struct _GtkWidgetPrivate       GtkWidgetPrivate;
 typedef struct _GtkWidgetClass	       GtkWidgetClass;
 typedef struct _GtkWidgetClassPrivate  GtkWidgetClassPrivate;
 typedef struct _GtkWidgetAuxInfo       GtkWidgetAuxInfo;
-typedef struct _GtkClipboard	       GtkClipboard;
-typedef struct _GtkTooltip             GtkTooltip;
-typedef struct _GtkWindow              GtkWindow;
 
 /**
  * GtkAllocation:
diff --git a/gtk/gtkwidgetpath.h b/gtk/gtkwidgetpath.h
index a8127e47fe..4c2c674ce7 100644
--- a/gtk/gtkwidgetpath.h
+++ b/gtk/gtkwidgetpath.h
@@ -25,15 +25,10 @@
 #include <glib-object.h>
 #include <gdk/gdk.h>
 #include <gtk/gtkenums.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 
-typedef struct _GtkWidgetPath GtkWidgetPath;
-
-/* We make this forward declaration here, since gtkwidget.h includes us.
- */
-typedef struct _GtkWidget      GtkWidget;
-
 #define GTK_TYPE_WIDGET_PATH (gtk_widget_path_get_type ())
 
 GType           gtk_widget_path_get_type            (void) G_GNUC_CONST;