Stop including single headers from gtk+ to be prepared for the upcoming

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>. svn path=/trunk/; revision=25781
2008-05-23 20:38:52 +00:00 · 2008-05-23 20:38:52 +00:00 · 598da617b0
parent 19a6177f74
commit 598da617b0
73 changed files with 49 additions and 164 deletions
--- a/29
+++ b/29
@ -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.
--- 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,
--- 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))
--- 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

--- 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))
--- 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))
--- 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,
--- 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))
--- 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))
--- 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))
--- 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))
--- 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))
--- 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


--- 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))
--- 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))
--- 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,
--- 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))
--- 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))
--- 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))
--- 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))
--- 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)


--- 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))
--- 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))
--- 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))
--- 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))
--- 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))
--- 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))
--- 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))
--- 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))
--- 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))
--- 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))
--- 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))
--- 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


--- 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))
--- 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))
--- 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))
--- 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))
--- 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;

--- 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))
--- 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__ */
--- 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

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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


--- 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"

--- 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 */
--- 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 */
--- 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 */
--- 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


--- 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


--- 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 ())
--- 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


--- 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


--- 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 */
--- 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 ())
--- 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 */
--- 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


--- 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
--- 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


--- 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 ())
--- 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


--- 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 */
--- 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


--- 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


--- 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"

--- 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


--- 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
--- 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"

--- 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__ */
-