diff --git a/ChangeLog b/ChangeLog
index 304f622f4a..c045ea9d45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2008-05-23  Michael Natterer  <mitch@gimp.org>
+
+	Stop including single headers from gtk+ to be prepared
+	for the upcoming GTK_DISABLE_SINGLE_INCLUDES:
+
+	* configure.in: add -DGTK_DISABLE_SINGLE_INCLUDES to CPPFLAGS.
+
+	* app/display/gimpcanvas.h
+	* app/display/gimpscalecombobox.h
+	* app/display/gimpstatusbar.h
+	* app/widgets/*.h
+	* libgimp/gimpprogressbar.h
+	* libgimp/gimpselectbutton.h
+	* libgimpwidgets/*.h
+	* libgimpwidgets/gimpstock.c
+	* plug-ins/uri/gimpmountoperation.h: remove inclusion of parent
+	classes and single files from gtk+.
+
+	* app/widgets/gtkwrapbox.h
+	* libgimp/gimpbrushmenu.c
+	* libgimp/gimpfontmenu.c
+	* libgimp/gimpgradientmenu.c
+	* libgimp/gimppalettemenu.c
+	* libgimp/gimppatternmenu.c
+	* libgimp/gimpselectbutton.c: #include <gtk/gtk.h>
+
+	* plug-ins/common/poppler.c: undef GTK_DISABLE_SINGLE_INCLUDES
+	when including <poppler.h>.
+
 2008-05-23  Sven Neumann  <sven@gimp.org>
 
 	* app/tools/gimpimagemaptool-settings.c: string change.
diff --git a/app/display/gimpcanvas.h b/app/display/gimpcanvas.h
index 95ddd41f1e..cf0318c7d4 100644
--- a/app/display/gimpcanvas.h
+++ b/app/display/gimpcanvas.h
@@ -20,9 +20,6 @@
 #define __GIMP_CANVAS_H__
 
 
-#include <gtk/gtkdrawingarea.h>
-
-
 typedef enum
 {
   GIMP_CANVAS_STYLE_BLACK,
diff --git a/app/display/gimpscalecombobox.h b/app/display/gimpscalecombobox.h
index 672c3d3579..bb8f3f8632 100644
--- a/app/display/gimpscalecombobox.h
+++ b/app/display/gimpscalecombobox.h
@@ -22,8 +22,6 @@
 #ifndef __GIMP_SCALE_COMBO_BOX_H__
 #define __GIMP_SCALE_COMBO_BOX_H__
 
-#include <gtk/gtkcomboboxentry.h>
-
 
 #define GIMP_TYPE_SCALE_COMBO_BOX            (gimp_scale_combo_box_get_type ())
 #define GIMP_SCALE_COMBO_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SCALE_COMBO_BOX, GimpScaleComboBox))
diff --git a/app/display/gimpstatusbar.h b/app/display/gimpstatusbar.h
index 0a834c7d1e..6e95de56d0 100644
--- a/app/display/gimpstatusbar.h
+++ b/app/display/gimpstatusbar.h
@@ -19,10 +19,9 @@
 #ifndef __GIMP_STATUSBAR_H__
 #define __GIMP_STATUSBAR_H__
 
-#include <gtk/gtkstatusbar.h>
-
 G_BEGIN_DECLS
 
+
 /*  maximal length of the format string for the cursor-coordinates  */
 #define CURSOR_FORMAT_LENGTH 32
 
diff --git a/app/widgets/gimpaction.h b/app/widgets/gimpaction.h
index 5543033b2e..b1fd7895e8 100644
--- a/app/widgets/gimpaction.h
+++ b/app/widgets/gimpaction.h
@@ -23,9 +23,6 @@
 #define __GIMP_ACTION_H__
 
 
-#include <gtk/gtkaction.h>
-
-
 #define GIMP_TYPE_ACTION            (gimp_action_get_type ())
 #define GIMP_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ACTION, GimpAction))
 #define GIMP_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ACTION, GimpActionClass))
diff --git a/app/widgets/gimpactiongroup.h b/app/widgets/gimpactiongroup.h
index a968f5ff10..a96c8fb6a6 100644
--- a/app/widgets/gimpactiongroup.h
+++ b/app/widgets/gimpactiongroup.h
@@ -22,8 +22,6 @@
 #ifndef __GIMP_ACTION_GROUP_H__
 #define __GIMP_ACTION_GROUP_H__
 
-#include <gtk/gtkactiongroup.h>
-
 
 #define GIMP_TYPE_ACTION_GROUP              (gimp_action_group_get_type ())
 #define GIMP_ACTION_GROUP(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ACTION_GROUP, GimpActionGroup))
diff --git a/app/widgets/gimpactionview.h b/app/widgets/gimpactionview.h
index ac443d9150..a23006b89c 100644
--- a/app/widgets/gimpactionview.h
+++ b/app/widgets/gimpactionview.h
@@ -23,9 +23,6 @@
 #define __GIMP_ACTION_VIEW_H__
 
 
-#include <gtk/gtktreeview.h>
-
-
 enum
 {
   GIMP_ACTION_VIEW_COLUMN_ACTION,
diff --git a/app/widgets/gimpblobeditor.h b/app/widgets/gimpblobeditor.h
index 97a4effe92..3bce363292 100644
--- a/app/widgets/gimpblobeditor.h
+++ b/app/widgets/gimpblobeditor.h
@@ -22,9 +22,6 @@
 #define  __GIMP_BLOB_EDITOR_H__
 
 
-#include "gtk/gtkdrawingarea.h"
-
-
 #define GIMP_TYPE_BLOB_EDITOR            (gimp_blob_editor_get_type ())
 #define GIMP_BLOB_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BLOB_EDITOR, GimpBlobEditor))
 #define GIMP_BLOB_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BLOB_EDITOR, GimpBlobEditorClass))
diff --git a/app/widgets/gimpcellrendererdashes.h b/app/widgets/gimpcellrendererdashes.h
index a31e546bf5..63c2b49b1f 100644
--- a/app/widgets/gimpcellrendererdashes.h
+++ b/app/widgets/gimpcellrendererdashes.h
@@ -23,9 +23,6 @@
 #define __GIMP_CELL_RENDERER_DASHES_H__
 
 
-#include <gtk/gtkcellrenderer.h>
-
-
 #define GIMP_TYPE_CELL_RENDERER_DASHES            (gimp_cell_renderer_dashes_get_type ())
 #define GIMP_CELL_RENDERER_DASHES(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CELL_RENDERER_DASHES, GimpCellRendererDashes))
 #define GIMP_CELL_RENDERER_DASHES_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CELL_RENDERER_DASHES, GimpCellRendererDashesClass))
diff --git a/app/widgets/gimpcellrendererviewable.h b/app/widgets/gimpcellrendererviewable.h
index 9a9348cfa6..18abba0b8b 100644
--- a/app/widgets/gimpcellrendererviewable.h
+++ b/app/widgets/gimpcellrendererviewable.h
@@ -23,9 +23,6 @@
 #define __GIMP_CELL_RENDERER_VIEWABLE_H__
 
 
-#include <gtk/gtkcellrenderer.h>
-
-
 #define GIMP_TYPE_CELL_RENDERER_VIEWABLE            (gimp_cell_renderer_viewable_get_type ())
 #define GIMP_CELL_RENDERER_VIEWABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CELL_RENDERER_VIEWABLE, GimpCellRendererViewable))
 #define GIMP_CELL_RENDERER_VIEWABLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CELL_RENDERER_VIEWABLE, GimpCellRendererViewableClass))
diff --git a/app/widgets/gimpcolorbar.h b/app/widgets/gimpcolorbar.h
index 62f217fb61..07fad5a232 100644
--- a/app/widgets/gimpcolorbar.h
+++ b/app/widgets/gimpcolorbar.h
@@ -20,9 +20,6 @@
 #define __GIMP_COLOR_BAR_H__
 
 
-#include <gtk/gtkmisc.h>
-
-
 #define GIMP_TYPE_COLOR_BAR            (gimp_color_bar_get_type ())
 #define GIMP_COLOR_BAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_BAR, GimpColorBar))
 #define GIMP_COLOR_BAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_BAR, GimpColorBarClass))
diff --git a/app/widgets/gimpcolordisplayeditor.h b/app/widgets/gimpcolordisplayeditor.h
index dcbb80a44a..c61a3b4327 100644
--- a/app/widgets/gimpcolordisplayeditor.h
+++ b/app/widgets/gimpcolordisplayeditor.h
@@ -23,9 +23,6 @@
 #define __GIMP_COLOR_DISPLAY_EDITOR_H__
 
 
-#include <gtk/gtkvbox.h>
-
-
 #define GIMP_TYPE_COLOR_DISPLAY_EDITOR            (gimp_color_display_editor_get_type ())
 #define GIMP_COLOR_DISPLAY_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_DISPLAY_EDITOR, GimpColorDisplayEditor))
 #define GIMP_COLOR_DISPLAY_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_DISPLAY_EDITOR, GimpColorDisplayEditorClass))
diff --git a/app/widgets/gimpcolorframe.h b/app/widgets/gimpcolorframe.h
index 2ecd486510..06cfbdfa19 100644
--- a/app/widgets/gimpcolorframe.h
+++ b/app/widgets/gimpcolorframe.h
@@ -20,9 +20,6 @@
 #define __GIMP_COLOR_FRAME_H__
 
 
-#include <gtk/gtkframe.h>
-
-
 #define GIMP_COLOR_FRAME_ROWS 5
 
 
diff --git a/app/widgets/gimpcontainercombobox.h b/app/widgets/gimpcontainercombobox.h
index 37dc666c73..e8ccc0929b 100644
--- a/app/widgets/gimpcontainercombobox.h
+++ b/app/widgets/gimpcontainercombobox.h
@@ -23,9 +23,6 @@
 #define __GIMP_CONTAINER_COMBO_BOX_H__
 
 
-#include <gtk/gtkcombobox.h>
-
-
 #define GIMP_TYPE_CONTAINER_COMBO_BOX            (gimp_container_combo_box_get_type ())
 #define GIMP_CONTAINER_COMBO_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_COMBO_BOX, GimpContainerComboBox))
 #define GIMP_CONTAINER_COMBO_BOX_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_COMBO_BOX, GimpContainerComboBoxClass))
diff --git a/app/widgets/gimpcontainereditor.h b/app/widgets/gimpcontainereditor.h
index 7645c10b76..34313af344 100644
--- a/app/widgets/gimpcontainereditor.h
+++ b/app/widgets/gimpcontainereditor.h
@@ -23,9 +23,6 @@
 #define __GIMP_CONTAINER_EDITOR_H__
 
 
-#include <gtk/gtkvbox.h>
-
-
 #define GIMP_TYPE_CONTAINER_EDITOR            (gimp_container_editor_get_type ())
 #define GIMP_CONTAINER_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_EDITOR, GimpContainerEditor))
 #define GIMP_CONTAINER_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_EDITOR, GimpContainerEditorClass))
diff --git a/app/widgets/gimpcontainerentry.h b/app/widgets/gimpcontainerentry.h
index ebaa1d2f6d..699cf62625 100644
--- a/app/widgets/gimpcontainerentry.h
+++ b/app/widgets/gimpcontainerentry.h
@@ -23,9 +23,6 @@
 #define __GIMP_CONTAINER_ENTRY_H__
 
 
-#include <gtk/gtkentry.h>
-
-
 enum
 {
   GIMP_CONTAINER_ENTRY_COLUMN_RENDERER,
diff --git a/app/widgets/gimpcontainerpopup.h b/app/widgets/gimpcontainerpopup.h
index c1da932315..543005881f 100644
--- a/app/widgets/gimpcontainerpopup.h
+++ b/app/widgets/gimpcontainerpopup.h
@@ -23,9 +23,6 @@
 #define __GIMP_CONTAINER_POPUP_H__
 
 
-#include <gtk/gtkwindow.h>
-
-
 #define GIMP_TYPE_CONTAINER_POPUP            (gimp_container_popup_get_type ())
 #define GIMP_CONTAINER_POPUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_POPUP, GimpContainerPopup))
 #define GIMP_CONTAINER_POPUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_POPUP, GimpContainerPopupClass))
diff --git a/app/widgets/gimpcontrollereditor.h b/app/widgets/gimpcontrollereditor.h
index fe1168a014..dcc59ca462 100644
--- a/app/widgets/gimpcontrollereditor.h
+++ b/app/widgets/gimpcontrollereditor.h
@@ -23,9 +23,6 @@
 #define __GIMP_CONTROLLER_EDITOR_H__
 
 
-#include <gtk/gtkvbox.h>
-
-
 #define GIMP_TYPE_CONTROLLER_EDITOR            (gimp_controller_editor_get_type ())
 #define GIMP_CONTROLLER_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTROLLER_EDITOR, GimpControllerEditor))
 #define GIMP_CONTROLLER_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTROLLER_EDITOR, GimpControllerEditorClass))
diff --git a/app/widgets/gimpcontrollerlist.h b/app/widgets/gimpcontrollerlist.h
index 81e9ff33ab..03ba932c38 100644
--- a/app/widgets/gimpcontrollerlist.h
+++ b/app/widgets/gimpcontrollerlist.h
@@ -23,9 +23,6 @@
 #define __GIMP_CONTROLLER_LIST_H__
 
 
-#include <gtk/gtkvbox.h>
-
-
 #define GIMP_TYPE_CONTROLLER_LIST            (gimp_controller_list_get_type ())
 #define GIMP_CONTROLLER_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTROLLER_LIST, GimpControllerList))
 #define GIMP_CONTROLLER_LIST_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTROLLER_LIST, GimpControllerListClass))
diff --git a/app/widgets/gimpdasheditor.h b/app/widgets/gimpdasheditor.h
index a649f00837..05fa2be63e 100644
--- a/app/widgets/gimpdasheditor.h
+++ b/app/widgets/gimpdasheditor.h
@@ -23,9 +23,6 @@
 #define __GIMP_DASH_EDITOR_H__
 
 
-#include <gtk/gtkdrawingarea.h>
-
-
 #define GIMP_TYPE_DASH_EDITOR            (gimp_dash_editor_get_type ())
 #define GIMP_DASH_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DASH_EDITOR, GimpDashEditor))
 #define GIMP_DASH_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DASH_EDITOR, GimpDashEditorClass))
diff --git a/app/widgets/gimpdockable.h b/app/widgets/gimpdockable.h
index d3dbcaa133..b6a9127cc1 100644
--- a/app/widgets/gimpdockable.h
+++ b/app/widgets/gimpdockable.h
@@ -23,9 +23,6 @@
 #define __GIMP_DOCKABLE_H__
 
 
-#include <gtk/gtkbin.h>
-
-
 #define GIMP_DOCKABLE_DRAG_OFFSET (-6)
 
 
diff --git a/app/widgets/gimpdockbook.h b/app/widgets/gimpdockbook.h
index 70428a4aef..a5c2a3fda1 100644
--- a/app/widgets/gimpdockbook.h
+++ b/app/widgets/gimpdockbook.h
@@ -23,9 +23,6 @@
 #define __GIMP_DOCKBOOK_H__
 
 
-#include <gtk/gtknotebook.h>
-
-
 #define GIMP_TYPE_DOCKBOOK            (gimp_dockbook_get_type ())
 #define GIMP_DOCKBOOK(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCKBOOK, GimpDockbook))
 #define GIMP_DOCKBOOK_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DOCKBOOK, GimpDockbookClass))
diff --git a/app/widgets/gimpdockseparator.h b/app/widgets/gimpdockseparator.h
index 73335090ff..f5df7ff305 100644
--- a/app/widgets/gimpdockseparator.h
+++ b/app/widgets/gimpdockseparator.h
@@ -23,9 +23,6 @@
 #define __GIMP_DOCK_SEPARATOR_H__
 
 
-#include <gtk/gtkeventbox.h>
-
-
 #define GIMP_TYPE_DOCK_SEPARATOR            (gimp_dock_separator_get_type ())
 #define GIMP_DOCK_SEPARATOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCK_SEPARATOR, GimpDockSeparator))
 #define GIMP_DOCK_SEPARATOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DOCK_SEPARATOR, GimpDockSeparatorClass))
diff --git a/app/widgets/gimpeditor.h b/app/widgets/gimpeditor.h
index bc7fcf8e6f..8b7e38215e 100644
--- a/app/widgets/gimpeditor.h
+++ b/app/widgets/gimpeditor.h
@@ -23,9 +23,6 @@
 #define __GIMP_EDITOR_H__
 
 
-#include <gtk/gtkvbox.h>
-
-
 #define GIMP_TYPE_EDITOR            (gimp_editor_get_type ())
 #define GIMP_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_EDITOR, GimpEditor))
 #define GIMP_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_EDITOR, GimpEditorClass))
diff --git a/app/widgets/gimpfgbgeditor.h b/app/widgets/gimpfgbgeditor.h
index e942b49895..16f58e3790 100644
--- a/app/widgets/gimpfgbgeditor.h
+++ b/app/widgets/gimpfgbgeditor.h
@@ -23,9 +23,6 @@
 #define __GIMP_FG_BG_EDITOR_H__
 
 
-#include <gtk/gtkdrawingarea.h>
-
-
 #define GIMP_TYPE_FG_BG_EDITOR            (gimp_fg_bg_editor_get_type ())
 #define GIMP_FG_BG_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FG_BG_EDITOR, GimpFgBgEditor))
 #define GIMP_FG_BG_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FG_BG_EDITOR, GimpFgBgEditorClass))
diff --git a/app/widgets/gimpfgbgview.h b/app/widgets/gimpfgbgview.h
index 3e09d65e1a..bfaa6ac111 100644
--- a/app/widgets/gimpfgbgview.h
+++ b/app/widgets/gimpfgbgview.h
@@ -23,9 +23,6 @@
 #define __GIMP_FG_BG_VIEW_H__
 
 
-#include <gtk/gtkdrawingarea.h>
-
-
 #define GIMP_TYPE_FG_BG_VIEW            (gimp_fg_bg_view_get_type ())
 #define GIMP_FG_BG_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FG_BG_VIEW, GimpFgBgView))
 #define GIMP_FG_BG_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FG_BG_VIEW, GimpFgBgViewClass))
diff --git a/app/widgets/gimpfileprocview.h b/app/widgets/gimpfileprocview.h
index 0944d62f7c..4206b6ccfd 100644
--- a/app/widgets/gimpfileprocview.h
+++ b/app/widgets/gimpfileprocview.h
@@ -23,9 +23,6 @@
 #define __GIMP_FILE_PROC_VIEW_H__
 
 
-#include <gtk/gtktreeview.h>
-
-
 #define GIMP_TYPE_FILE_PROC_VIEW            (gimp_file_proc_view_get_type ())
 #define GIMP_FILE_PROC_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FILE_PROC_VIEW, GimpFileProcView))
 #define GIMP_FILE_PROC_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FILE_PROC_VIEW, GimpFileProcViewClass))
diff --git a/app/widgets/gimpgrideditor.h b/app/widgets/gimpgrideditor.h
index c760bf7b04..a8459ba9a5 100644
--- a/app/widgets/gimpgrideditor.h
+++ b/app/widgets/gimpgrideditor.h
@@ -23,9 +23,6 @@
 #define __GIMP_GRID_EDITOR_H__
 
 
-#include <gtk/gtkvbox.h>
-
-
 #define GIMP_TYPE_GRID_EDITOR            (gimp_grid_editor_get_type ())
 #define GIMP_GRID_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GRID_EDITOR, GimpGridEditor))
 #define GIMP_GRID_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GRID_EDITOR, GimpGridEditorClass))
diff --git a/app/widgets/gimphandlebar.h b/app/widgets/gimphandlebar.h
index 3e69a33f8a..297dbcfba3 100644
--- a/app/widgets/gimphandlebar.h
+++ b/app/widgets/gimphandlebar.h
@@ -20,9 +20,6 @@
 #define __GIMP_HANDLE_BAR_H__
 
 
-#include <gtk/gtkmisc.h>
-
-
 #define GIMP_TYPE_HANDLE_BAR            (gimp_handle_bar_get_type ())
 #define GIMP_HANDLE_BAR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HANDLE_BAR, GimpHandleBar))
 #define GIMP_HANDLE_BAR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HANDLE_BAR, GimpHandleBarClass))
diff --git a/app/widgets/gimphistogramview.h b/app/widgets/gimphistogramview.h
index c97bc0d483..5785e9d85f 100644
--- a/app/widgets/gimphistogramview.h
+++ b/app/widgets/gimphistogramview.h
@@ -20,9 +20,6 @@
 #define __GIMP_HISTOGRAM_VIEW_H__
 
 
-#include <gtk/gtkdrawingarea.h>
-
-
 #define GIMP_TYPE_HISTOGRAM_VIEW            (gimp_histogram_view_get_type ())
 #define GIMP_HISTOGRAM_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HISTOGRAM_VIEW, GimpHistogramView))
 #define GIMP_HISTOGRAM_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HISTOGRAM_VIEW, GimpHistogramViewClass))
diff --git a/app/widgets/gimpimageparasiteview.h b/app/widgets/gimpimageparasiteview.h
index 821f12c431..d99b1ca11f 100644
--- a/app/widgets/gimpimageparasiteview.h
+++ b/app/widgets/gimpimageparasiteview.h
@@ -23,9 +23,6 @@
 #define __GIMP_IMAGE_PARASITE_VIEW_H__
 
 
-#include <gtk/gtkvbox.h>
-
-
 #define GIMP_TYPE_IMAGE_PARASITE_VIEW            (gimp_image_parasite_view_get_type ())
 #define GIMP_IMAGE_PARASITE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_PARASITE_VIEW, GimpImageParasiteView))
 #define GIMP_IMAGE_PARASITE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGE_PARASITE_VIEW, GimpImageParasiteViewClass))
diff --git a/app/widgets/gimpimagepropview.h b/app/widgets/gimpimagepropview.h
index 99c6c98b3a..eb144c037a 100644
--- a/app/widgets/gimpimagepropview.h
+++ b/app/widgets/gimpimagepropview.h
@@ -23,9 +23,6 @@
 #define __GIMP_IMAGE_PROP_VIEW_H__
 
 
-#include <gtk/gtktable.h>
-
-
 #define GIMP_TYPE_IMAGE_PROP_VIEW            (gimp_image_prop_view_get_type ())
 #define GIMP_IMAGE_PROP_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_PROP_VIEW, GimpImagePropView))
 #define GIMP_IMAGE_PROP_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGE_PROP_VIEW, GimpImagePropViewClass))
diff --git a/app/widgets/gimpprogressbox.h b/app/widgets/gimpprogressbox.h
index 64cf5d9846..353ee4c7f2 100644
--- a/app/widgets/gimpprogressbox.h
+++ b/app/widgets/gimpprogressbox.h
@@ -22,8 +22,6 @@
 #ifndef __GIMP_PROGRESS_BOX_H__
 #define __GIMP_PROGRESS_BOX_H__
 
-#include <gtk/gtkvbox.h>
-
 G_BEGIN_DECLS
 
 
diff --git a/app/widgets/gimpradioaction.h b/app/widgets/gimpradioaction.h
index c5738341bc..f0eb020d6f 100644
--- a/app/widgets/gimpradioaction.h
+++ b/app/widgets/gimpradioaction.h
@@ -24,9 +24,6 @@
 #define __GIMP_RADIO_ACTION_H__
 
 
-#include <gtk/gtkradioaction.h>
-
-
 #define GIMP_TYPE_RADIO_ACTION            (gimp_radio_action_get_type ())
 #define GIMP_RADIO_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_RADIO_ACTION, GimpRadioAction))
 #define GIMP_RADIO_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_RADIO_ACTION, GimpRadioActionClass))
diff --git a/app/widgets/gimpstrokeeditor.h b/app/widgets/gimpstrokeeditor.h
index bcdc45812e..00a79af7a1 100644
--- a/app/widgets/gimpstrokeeditor.h
+++ b/app/widgets/gimpstrokeeditor.h
@@ -23,9 +23,6 @@
 #define __GIMP_STROKE_EDITOR_H__
 
 
-#include <gtk/gtkvbox.h>
-
-
 #define GIMP_TYPE_STROKE_EDITOR            (gimp_stroke_editor_get_type ())
 #define GIMP_STROKE_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_STROKE_EDITOR, GimpStrokeEditor))
 #define GIMP_STROKE_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_STROKE_EDITOR, GimpStrokeEditorClass))
diff --git a/app/widgets/gimptemplateeditor.h b/app/widgets/gimptemplateeditor.h
index fbcc06add0..98d4236e1e 100644
--- a/app/widgets/gimptemplateeditor.h
+++ b/app/widgets/gimptemplateeditor.h
@@ -23,9 +23,6 @@
 #define __GIMP_TEMPLATE_EDITOR_H__
 
 
-#include <gtk/gtkvbox.h>
-
-
 #define GIMP_TYPE_TEMPLATE_EDITOR            (gimp_template_editor_get_type ())
 #define GIMP_TEMPLATE_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEMPLATE_EDITOR, GimpTemplateEditor))
 #define GIMP_TEMPLATE_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TEMPLATE_EDITOR, GimpTemplateEditorClass))
diff --git a/app/widgets/gimptoggleaction.h b/app/widgets/gimptoggleaction.h
index 8de24cc78c..5dfc15b406 100644
--- a/app/widgets/gimptoggleaction.h
+++ b/app/widgets/gimptoggleaction.h
@@ -24,9 +24,6 @@
 #define __GIMP_TOGGLE_ACTION_H__
 
 
-#include <gtk/gtktoggleaction.h>
-
-
 #define GIMP_TYPE_TOGGLE_ACTION            (gimp_toggle_action_get_type ())
 #define GIMP_TOGGLE_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOGGLE_ACTION, GimpToggleAction))
 #define GIMP_TOGGLE_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOGGLE_ACTION, GimpToggleActionClass))
diff --git a/app/widgets/gimpuimanager.h b/app/widgets/gimpuimanager.h
index e66a32bccf..1cd1225e85 100644
--- a/app/widgets/gimpuimanager.h
+++ b/app/widgets/gimpuimanager.h
@@ -22,8 +22,6 @@
 #ifndef __GIMP_UI_MANAGER_H__
 #define __GIMP_UI_MANAGER_H__
 
-#include <gtk/gtkuimanager.h>
-
 
 typedef struct _GimpUIManagerUIEntry GimpUIManagerUIEntry;
 
diff --git a/app/widgets/gimpunitcombobox.h b/app/widgets/gimpunitcombobox.h
index 93f88d91b7..5a39879582 100644
--- a/app/widgets/gimpunitcombobox.h
+++ b/app/widgets/gimpunitcombobox.h
@@ -22,8 +22,6 @@
 #ifndef __GIMP_UNIT_COMBO_BOX_H__
 #define __GIMP_UNIT_COMBO_BOX_H__
 
-#include <gtk/gtkcombobox.h>
-
 
 #define GIMP_TYPE_UNIT_COMBO_BOX            (gimp_unit_combo_box_get_type ())
 #define GIMP_UNIT_COMBO_BOX(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_UNIT_COMBO_BOX, GimpUnitComboBox))
diff --git a/app/widgets/gimpwindow.h b/app/widgets/gimpwindow.h
index 190181b028..a16a31dd58 100644
--- a/app/widgets/gimpwindow.h
+++ b/app/widgets/gimpwindow.h
@@ -22,9 +22,6 @@
 #define __GIMP_WINDOW_H__
 
 
-#include <gtk/gtkwindow.h>
-
-
 #define GIMP_TYPE_WINDOW            (gimp_window_get_type ())
 #define GIMP_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_WINDOW, GimpWindow))
 #define GIMP_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_WINDOW, GimpWindowClass))
@@ -46,7 +43,7 @@ struct _GimpWindowClass
 };
 
 
-GType   gimp_window_get_type     (void) G_GNUC_CONST;
+GType   gimp_window_get_type (void) G_GNUC_CONST;
 
 
 #endif /* __GIMP_WINDOW_H__ */
diff --git a/app/widgets/gtkwrapbox.h b/app/widgets/gtkwrapbox.h
index e557b5da79..61e5aef05a 100644
--- a/app/widgets/gtkwrapbox.h
+++ b/app/widgets/gtkwrapbox.h
@@ -23,8 +23,7 @@
 #ifndef __GTK_WRAP_BOX_H__
 #define __GTK_WRAP_BOX_H__
 
-
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/configure.in b/configure.in
index e96f524e90..06e73986be 100644
--- a/configure.in
+++ b/configure.in
@@ -1839,7 +1839,7 @@ AC_SUBST(MIME_TYPES)
 # Disable deprecated APIs
 #########################
 
-CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES"
+CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
 
 if test "x$have_glib_2_19" != "xyes"; then
   CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
diff --git a/libgimp/gimpbrushmenu.c b/libgimp/gimpbrushmenu.c
index 9d97824801..64ceba01de 100644
--- a/libgimp/gimpbrushmenu.c
+++ b/libgimp/gimpbrushmenu.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+
 #include "gimp.h"
 
 #include "gimpuitypes.h"
diff --git a/libgimp/gimpfontmenu.c b/libgimp/gimpfontmenu.c
index 8872c7a3cd..73fc332b55 100644
--- a/libgimp/gimpfontmenu.c
+++ b/libgimp/gimpfontmenu.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+
 #include "gimp.h"
 
 #include "gimpuitypes.h"
diff --git a/libgimp/gimpgradientmenu.c b/libgimp/gimpgradientmenu.c
index f2351c50df..ecea5e1995 100644
--- a/libgimp/gimpgradientmenu.c
+++ b/libgimp/gimpgradientmenu.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+
 #include "gimp.h"
 
 #include "gimpuitypes.h"
diff --git a/libgimp/gimppalettemenu.c b/libgimp/gimppalettemenu.c
index 6d90a9a169..9253884bfb 100644
--- a/libgimp/gimppalettemenu.c
+++ b/libgimp/gimppalettemenu.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+
 #include "gimp.h"
 
 #include "gimpuitypes.h"
diff --git a/libgimp/gimppatternmenu.c b/libgimp/gimppatternmenu.c
index 6e12c5325d..55cfb852d2 100644
--- a/libgimp/gimppatternmenu.c
+++ b/libgimp/gimppatternmenu.c
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+
 #include "gimp.h"
 
 #include "gimpuitypes.h"
diff --git a/libgimp/gimpprogressbar.h b/libgimp/gimpprogressbar.h
index d8d1cdd869..5389b5706f 100644
--- a/libgimp/gimpprogressbar.h
+++ b/libgimp/gimpprogressbar.h
@@ -23,8 +23,6 @@
 #ifndef __GIMP_PROGRESS_BAR_H__
 #define __GIMP_PROGRESS_BAR_H__
 
-#include <gtk/gtkprogressbar.h>
-
 G_BEGIN_DECLS
 
 
diff --git a/libgimp/gimpselectbutton.c b/libgimp/gimpselectbutton.c
index c3aa3d0dde..60d86033bd 100644
--- a/libgimp/gimpselectbutton.c
+++ b/libgimp/gimpselectbutton.c
@@ -22,7 +22,10 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+
 #include "gimp.h"
+
 #include "gimpuitypes.h"
 #include "gimpselectbutton.h"
 
diff --git a/libgimp/gimpselectbutton.h b/libgimp/gimpselectbutton.h
index e8b8e184ee..5ea72ca77a 100644
--- a/libgimp/gimpselectbutton.h
+++ b/libgimp/gimpselectbutton.h
@@ -22,8 +22,6 @@
 #ifndef __GIMP_SELECT_BUTTON_H__
 #define __GIMP_SELECT_BUTTON_H__
 
-#include <gtk/gtkhbox.h>
-
 G_BEGIN_DECLS
 
 /* For information look into the C source or the html documentation */
diff --git a/libgimpwidgets/gimpbrowser.h b/libgimpwidgets/gimpbrowser.h
index ff414e376c..f2aace6936 100644
--- a/libgimpwidgets/gimpbrowser.h
+++ b/libgimpwidgets/gimpbrowser.h
@@ -23,8 +23,6 @@
 #ifndef __GIMP_BROWSER_H__
 #define __GIMP_BROWSER_H__
 
-#include <gtk/gtkhpaned.h>
-
 G_BEGIN_DECLS
 
 /* For information look into the C source or the html documentation */
diff --git a/libgimpwidgets/gimpbutton.h b/libgimpwidgets/gimpbutton.h
index c772b3eabd..4d141d5561 100644
--- a/libgimpwidgets/gimpbutton.h
+++ b/libgimpwidgets/gimpbutton.h
@@ -23,8 +23,6 @@
 #ifndef __GIMP_BUTTON_H__
 #define __GIMP_BUTTON_H__
 
-#include <gtk/gtkbutton.h>
-
 G_BEGIN_DECLS
 
 /* For information look into the C source or the html documentation */
diff --git a/libgimpwidgets/gimpchainbutton.h b/libgimpwidgets/gimpchainbutton.h
index db2426046e..3350ae51d0 100644
--- a/libgimpwidgets/gimpchainbutton.h
+++ b/libgimpwidgets/gimpchainbutton.h
@@ -31,8 +31,6 @@
 #ifndef __GIMP_CHAIN_BUTTON_H__
 #define __GIMP_CHAIN_BUTTON_H__
 
-#include <gtk/gtktable.h>
-
 G_BEGIN_DECLS
 
 
diff --git a/libgimpwidgets/gimpcolorarea.h b/libgimpwidgets/gimpcolorarea.h
index 58046483a0..c9798b59c3 100644
--- a/libgimpwidgets/gimpcolorarea.h
+++ b/libgimpwidgets/gimpcolorarea.h
@@ -28,8 +28,6 @@
 #ifndef __GIMP_COLOR_AREA_H__
 #define __GIMP_COLOR_AREA_H__
 
-#include <gtk/gtkdrawingarea.h>
-
 G_BEGIN_DECLS
 
 
diff --git a/libgimpwidgets/gimpcolorprofilecombobox.h b/libgimpwidgets/gimpcolorprofilecombobox.h
index 22d06e084a..104fd4d450 100644
--- a/libgimpwidgets/gimpcolorprofilecombobox.h
+++ b/libgimpwidgets/gimpcolorprofilecombobox.h
@@ -23,8 +23,6 @@
 #ifndef __GIMP_COLOR_PROFILE_COMBO_BOX_H__
 #define __GIMP_COLOR_PROFILE_COMBO_BOX_H__
 
-#include <gtk/gtkcombobox.h>
-
 G_BEGIN_DECLS
 
 #define GIMP_TYPE_COLOR_PROFILE_COMBO_BOX            (gimp_color_profile_combo_box_get_type ())
diff --git a/libgimpwidgets/gimpcolorprofilestore.h b/libgimpwidgets/gimpcolorprofilestore.h
index 1905d6a864..e17d9e6e41 100644
--- a/libgimpwidgets/gimpcolorprofilestore.h
+++ b/libgimpwidgets/gimpcolorprofilestore.h
@@ -23,8 +23,6 @@
 #ifndef __GIMP_COLOR_PROFILE_STORE_H__
 #define __GIMP_COLOR_PROFILE_STORE_H__
 
-#include <gtk/gtkliststore.h>
-
 G_BEGIN_DECLS
 
 
diff --git a/libgimpwidgets/gimpcolorscale.h b/libgimpwidgets/gimpcolorscale.h
index 55c84816b0..03c8081a44 100644
--- a/libgimpwidgets/gimpcolorscale.h
+++ b/libgimpwidgets/gimpcolorscale.h
@@ -29,8 +29,6 @@
 #ifndef __GIMP_COLOR_SCALE_H__
 #define __GIMP_COLOR_SCALE_H__
 
-#include <gtk/gtkscale.h>
-
 G_BEGIN_DECLS
 
 
diff --git a/libgimpwidgets/gimpdialog.h b/libgimpwidgets/gimpdialog.h
index b53e20d446..0c7772cdc3 100644
--- a/libgimpwidgets/gimpdialog.h
+++ b/libgimpwidgets/gimpdialog.h
@@ -23,8 +23,6 @@
 #ifndef __GIMP_DIALOG_H__
 #define __GIMP_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
-
 G_BEGIN_DECLS
 
 /* For information look into the C source or the html documentation */
diff --git a/libgimpwidgets/gimpenumlabel.h b/libgimpwidgets/gimpenumlabel.h
index 4ceafd8e90..41b6df50fc 100644
--- a/libgimpwidgets/gimpenumlabel.h
+++ b/libgimpwidgets/gimpenumlabel.h
@@ -23,8 +23,6 @@
 #ifndef __GIMP_ENUM__LABEL_H__
 #define __GIMP_ENUM__LABEL_H__
 
-#include <gtk/gtklabel.h>
-
 G_BEGIN_DECLS
 
 #define GIMP_TYPE_ENUM_LABEL            (gimp_enum_label_get_type ())
diff --git a/libgimpwidgets/gimpframe.h b/libgimpwidgets/gimpframe.h
index d530b3add1..a0aa45ac38 100644
--- a/libgimpwidgets/gimpframe.h
+++ b/libgimpwidgets/gimpframe.h
@@ -23,8 +23,6 @@
 #ifndef __GIMP_FRAME_H__
 #define __GIMP_FRAME_H__
 
-#include <gtk/gtkframe.h>
-
 G_BEGIN_DECLS
 
 /* For information look into the C source or the html documentation */
diff --git a/libgimpwidgets/gimpintcombobox.h b/libgimpwidgets/gimpintcombobox.h
index 55fafe3091..1717db97c1 100644
--- a/libgimpwidgets/gimpintcombobox.h
+++ b/libgimpwidgets/gimpintcombobox.h
@@ -23,8 +23,6 @@
 #ifndef __GIMP_INT_COMBO_BOX_H__
 #define __GIMP_INT_COMBO_BOX_H__
 
-#include <gtk/gtkcombobox.h>
-
 G_BEGIN_DECLS
 
 
diff --git a/libgimpwidgets/gimpintstore.h b/libgimpwidgets/gimpintstore.h
index 6d255a5b22..7eb275aa07 100644
--- a/libgimpwidgets/gimpintstore.h
+++ b/libgimpwidgets/gimpintstore.h
@@ -23,8 +23,6 @@
 #ifndef __GIMP_INT_STORE_H__
 #define __GIMP_INT_STORE_H__
 
-#include <gtk/gtkliststore.h>
-
 G_BEGIN_DECLS
 
 typedef enum
diff --git a/libgimpwidgets/gimpmemsizeentry.h b/libgimpwidgets/gimpmemsizeentry.h
index 1682031763..24ea2c3418 100644
--- a/libgimpwidgets/gimpmemsizeentry.h
+++ b/libgimpwidgets/gimpmemsizeentry.h
@@ -23,8 +23,6 @@
 #ifndef __GIMP_MEMSIZE_ENTRY_H__
 #define __GIMP_MEMSIZE_ENTRY_H__
 
-#include <gtk/gtkhbox.h>
-
 G_BEGIN_DECLS
 
 
diff --git a/libgimpwidgets/gimppageselector.h b/libgimpwidgets/gimppageselector.h
index 6218b6a4bb..fd637315d8 100644
--- a/libgimpwidgets/gimppageselector.h
+++ b/libgimpwidgets/gimppageselector.h
@@ -23,8 +23,6 @@
 #ifndef __GIMP_PAGE_SELECTOR_H__
 #define __GIMP_PAGE_SELECTOR_H__
 
-#include <gtk/gtkvbox.h>
-
 G_BEGIN_DECLS
 
 #define GIMP_TYPE_PAGE_SELECTOR            (gimp_page_selector_get_type ())
diff --git a/libgimpwidgets/gimppickbutton.h b/libgimpwidgets/gimppickbutton.h
index 39817c4741..d25a4b5f4d 100644
--- a/libgimpwidgets/gimppickbutton.h
+++ b/libgimpwidgets/gimppickbutton.h
@@ -20,8 +20,6 @@
 #ifndef __GIMP_PICK_BUTTON_H__
 #define __GIMP_PICK_BUTTON_H__
 
-#include <gtk/gtkbutton.h>
-
 G_BEGIN_DECLS
 
 
diff --git a/libgimpwidgets/gimppixmap.h b/libgimpwidgets/gimppixmap.h
index 9c16c0f6d9..8bedcedc1a 100644
--- a/libgimpwidgets/gimppixmap.h
+++ b/libgimpwidgets/gimppixmap.h
@@ -25,8 +25,6 @@
 #ifndef __GIMP_PIXMAP_H__
 #define __GIMP_PIXMAP_H__
 
-#include <gtk/gtkimage.h>
-
 G_BEGIN_DECLS
 
 /* For information look into the C source or the html documentation */
diff --git a/libgimpwidgets/gimppreview.h b/libgimpwidgets/gimppreview.h
index 87f3be6a47..b355b183b0 100644
--- a/libgimpwidgets/gimppreview.h
+++ b/libgimpwidgets/gimppreview.h
@@ -22,8 +22,6 @@
 #ifndef __GIMP_PREVIEW_H__
 #define __GIMP_PREVIEW_H__
 
-#include <gtk/gtkvbox.h>
-
 G_BEGIN_DECLS
 
 
diff --git a/libgimpwidgets/gimppreviewarea.h b/libgimpwidgets/gimppreviewarea.h
index faace897fd..7f5593c786 100644
--- a/libgimpwidgets/gimppreviewarea.h
+++ b/libgimpwidgets/gimppreviewarea.h
@@ -20,8 +20,6 @@
 #ifndef __GIMP_PREVIEW_AREA_H__
 #define __GIMP_PREVIEW_AREA_H__
 
-#include <gtk/gtkdrawingarea.h>
-
 G_BEGIN_DECLS
 
 
diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c
index 129db361da..8001c2bf2a 100644
--- a/libgimpwidgets/gimpstock.c
+++ b/libgimpwidgets/gimpstock.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include <gtk/gtkiconfactory.h>
 
 #include "gimpstock.h"
 
diff --git a/libgimpwidgets/gimpstringcombobox.h b/libgimpwidgets/gimpstringcombobox.h
index 7d1f4759e6..e7016daafc 100644
--- a/libgimpwidgets/gimpstringcombobox.h
+++ b/libgimpwidgets/gimpstringcombobox.h
@@ -23,8 +23,6 @@
 #ifndef __GIMP_STRING_COMBO_BOX_H__
 #define __GIMP_STRING_COMBO_BOX_H__
 
-#include <gtk/gtkcombobox.h>
-
 G_BEGIN_DECLS
 
 
diff --git a/libgimpwidgets/gimpunitmenu.h b/libgimpwidgets/gimpunitmenu.h
index e5807259db..eb4b48a63b 100644
--- a/libgimpwidgets/gimpunitmenu.h
+++ b/libgimpwidgets/gimpunitmenu.h
@@ -27,8 +27,6 @@
 #undef GTK_DISABLE_DEPRECATED
 #include <gtk/gtkoptionmenu.h>
 #define GTK_DISABLE_DEPRECATED
-#else
-#include <gtk/gtkoptionmenu.h>
 #endif
 
 G_BEGIN_DECLS
diff --git a/plug-ins/common/poppler.c b/plug-ins/common/poppler.c
index 1d8f280e18..f8a23ab5c3 100644
--- a/plug-ins/common/poppler.c
+++ b/plug-ins/common/poppler.c
@@ -26,7 +26,9 @@
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
+#undef GTK_DISABLE_SINGLE_INCLUDES
 #include <poppler.h>
+#define GTK_DISABLE_SINGLE_INCLUDES
 
 #include "libgimp/stdplugins-intl.h"
 
diff --git a/plug-ins/uri/gimpmountoperation.h b/plug-ins/uri/gimpmountoperation.h
index 45efcf7bf6..937e08bb9f 100644
--- a/plug-ins/uri/gimpmountoperation.h
+++ b/plug-ins/uri/gimpmountoperation.h
@@ -27,10 +27,8 @@
 #ifndef __GIMP_MOUNT_OPERATION_H__
 #define __GIMP_MOUNT_OPERATION_H__
 
-#include <glib.h>
 #include <gio/gio.h>
-#include <gdk/gdkscreen.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
@@ -77,4 +75,3 @@ GdkScreen       *gimp_mount_operation_get_screen (GimpMountOperation *op);
 G_END_DECLS
 
 #endif /* __GIMP_MOUNT_OPERATION_H__ */
-