summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog47
-rw-r--r--gtk/gtk.h2
-rw-r--r--gtk/gtkaboutdialog.h4
-rw-r--r--gtk/gtkaccelgroup.h4
-rw-r--r--gtk/gtkaccellabel.h4
-rw-r--r--gtk/gtkaccelmap.h5
-rw-r--r--gtk/gtkaccessible.h4
-rw-r--r--gtk/gtkaction.h5
-rw-r--r--gtk/gtkactiongroup.h5
-rw-r--r--gtk/gtkadjustment.h4
-rw-r--r--gtk/gtkalignment.h4
-rw-r--r--gtk/gtkarrow.h4
-rw-r--r--gtk/gtkaspectframe.h4
-rw-r--r--gtk/gtkassistant.h4
-rw-r--r--gtk/gtkbbox.h4
-rw-r--r--gtk/gtkbin.h4
-rw-r--r--gtk/gtkbindings.h4
-rw-r--r--gtk/gtkbox.h4
-rw-r--r--gtk/gtkbuildable.h4
-rw-r--r--gtk/gtkbuilder.h5
-rw-r--r--gtk/gtkbutton.h4
-rw-r--r--gtk/gtkcalendar.h4
-rw-r--r--gtk/gtkcelleditable.h4
-rw-r--r--gtk/gtkcelllayout.h4
-rw-r--r--gtk/gtkcellrenderer.h4
-rw-r--r--gtk/gtkcellrendereraccel.h4
-rw-r--r--gtk/gtkcellrenderercombo.h4
-rw-r--r--gtk/gtkcellrendererpixbuf.h4
-rw-r--r--gtk/gtkcellrendererprogress.h4
-rw-r--r--gtk/gtkcellrendererspin.h4
-rw-r--r--gtk/gtkcellrenderertext.h5
-rw-r--r--gtk/gtkcellrenderertoggle.h4
-rw-r--r--gtk/gtkcellview.h4
-rw-r--r--gtk/gtkcheckbutton.h4
-rw-r--r--gtk/gtkcheckmenuitem.h4
-rw-r--r--gtk/gtkclipboard.h4
-rw-r--r--gtk/gtkclist.c1
-rw-r--r--gtk/gtkclist.h10
-rw-r--r--gtk/gtkcolorbutton.h4
-rw-r--r--gtk/gtkcolorsel.h5
-rw-r--r--gtk/gtkcolorseldialog.h5
-rw-r--r--gtk/gtkcombo.h4
-rw-r--r--gtk/gtkcombobox.h4
-rw-r--r--gtk/gtkcomboboxentry.h4
-rw-r--r--gtk/gtkcontainer.h4
-rw-r--r--gtk/gtkctree.h2
-rw-r--r--gtk/gtkcurve.h4
-rw-r--r--gtk/gtkdebug.h4
-rw-r--r--gtk/gtkdialog.h4
-rw-r--r--gtk/gtkdnd.h4
-rw-r--r--gtk/gtkdrawingarea.h4
-rw-r--r--gtk/gtkeditable.h4
-rw-r--r--gtk/gtkentry.h4
-rw-r--r--gtk/gtkentrycompletion.h4
-rw-r--r--gtk/gtkenums.h4
-rw-r--r--gtk/gtkeventbox.h4
-rw-r--r--gtk/gtkexpander.h4
-rw-r--r--gtk/gtkfilechooser.h4
-rw-r--r--gtk/gtkfilechooserbutton.h4
-rw-r--r--gtk/gtkfilechooserdialog.h4
-rw-r--r--gtk/gtkfilechooserwidget.h4
-rw-r--r--gtk/gtkfilefilter.h4
-rw-r--r--gtk/gtkfilesel.h4
-rw-r--r--gtk/gtkfixed.h4
-rw-r--r--gtk/gtkfontbutton.h4
-rw-r--r--gtk/gtkfontsel.h4
-rw-r--r--gtk/gtkframe.h4
-rw-r--r--gtk/gtkgamma.h4
-rw-r--r--gtk/gtkgc.h4
-rw-r--r--gtk/gtkhandlebox.h3
-rw-r--r--gtk/gtkhbbox.h4
-rw-r--r--gtk/gtkhbox.h4
-rw-r--r--gtk/gtkhpaned.h4
-rw-r--r--gtk/gtkhruler.h4
-rw-r--r--gtk/gtkhscale.h4
-rw-r--r--gtk/gtkhscrollbar.h4
-rw-r--r--gtk/gtkhseparator.h4
-rw-r--r--gtk/gtkiconfactory.h4
-rw-r--r--gtk/gtkicontheme.h4
-rw-r--r--gtk/gtkiconview.h5
-rw-r--r--gtk/gtkimage.h4
-rw-r--r--gtk/gtkimagemenuitem.h4
-rw-r--r--gtk/gtkimcontext.h4
-rw-r--r--gtk/gtkimcontextsimple.h4
-rw-r--r--gtk/gtkimmodule.h2
-rw-r--r--gtk/gtkimmulticontext.h4
-rw-r--r--gtk/gtkinputdialog.h4
-rw-r--r--gtk/gtkinvisible.h4
-rw-r--r--gtk/gtkitem.h4
-rw-r--r--gtk/gtkitemfactory.h2
-rw-r--r--gtk/gtklabel.h4
-rw-r--r--gtk/gtklayout.h4
-rw-r--r--gtk/gtklinkbutton.h4
-rw-r--r--gtk/gtklist.h6
-rw-r--r--gtk/gtklistitem.h4
-rw-r--r--gtk/gtkliststore.h4
-rw-r--r--gtk/gtkmain.h4
-rw-r--r--gtk/gtkmenu.h4
-rw-r--r--gtk/gtkmenubar.h4
-rw-r--r--gtk/gtkmenuitem.h4
-rw-r--r--gtk/gtkmenushell.h4
-rw-r--r--gtk/gtkmenutoolbutton.h4
-rw-r--r--gtk/gtkmessagedialog.h5
-rw-r--r--gtk/gtkmisc.h4
-rw-r--r--gtk/gtkmodules.h4
-rw-r--r--gtk/gtkmountoperation.h4
-rw-r--r--gtk/gtknotebook.h4
-rw-r--r--gtk/gtkobject.h4
-rw-r--r--gtk/gtkoldeditable.h4
-rw-r--r--gtk/gtkoptionmenu.h4
-rw-r--r--gtk/gtkpagesetup.h4
-rw-r--r--gtk/gtkpagesetupunixdialog.h5
-rw-r--r--gtk/gtkpaned.h4
-rw-r--r--gtk/gtkpapersize.h4
-rw-r--r--gtk/gtkpixmap.h4
-rw-r--r--gtk/gtkplug.h4
-rw-r--r--gtk/gtkpreview.h3
-rw-r--r--gtk/gtkprintbackend.h3
-rw-r--r--gtk/gtkprintcontext.h4
-rw-r--r--gtk/gtkprinter-private.h4
-rw-r--r--gtk/gtkprinter.h5
-rw-r--r--gtk/gtkprintjob.h4
-rw-r--r--gtk/gtkprintoperation.h4
-rw-r--r--gtk/gtkprintoperationpreview.h4
-rw-r--r--gtk/gtkprintsettings.h5
-rw-r--r--gtk/gtkprintunixdialog.h5
-rw-r--r--gtk/gtkprogressbar.h4
-rw-r--r--gtk/gtkradioaction.h5
-rw-r--r--gtk/gtkradiobutton.h4
-rw-r--r--gtk/gtkradiomenuitem.h4
-rw-r--r--gtk/gtkradiotoolbutton.h4
-rw-r--r--gtk/gtkrange.h4
-rw-r--r--gtk/gtkrc.h4
-rw-r--r--gtk/gtkrecentaction.h4
-rw-r--r--gtk/gtkrecentchooser.h4
-rw-r--r--gtk/gtkrecentchooserdialog.h4
-rw-r--r--gtk/gtkrecentchoosermenu.h4
-rw-r--r--gtk/gtkrecentchooserwidget.h4
-rw-r--r--gtk/gtkrecentfilter.h4
-rw-r--r--gtk/gtkrecentmanager.h4
-rw-r--r--gtk/gtkruler.h4
-rw-r--r--gtk/gtkscale.h4
-rw-r--r--gtk/gtkscalebutton.h4
-rw-r--r--gtk/gtkscrollbar.h4
-rw-r--r--gtk/gtkscrolledwindow.h4
-rw-r--r--gtk/gtkselection.h4
-rw-r--r--gtk/gtkseparator.h4
-rw-r--r--gtk/gtkseparatormenuitem.h4
-rw-r--r--gtk/gtkseparatortoolitem.h4
-rw-r--r--gtk/gtksettings.h5
-rw-r--r--gtk/gtkshow.h4
-rw-r--r--gtk/gtksignal.h4
-rw-r--r--gtk/gtksizegroup.h4
-rw-r--r--gtk/gtksocket.h4
-rw-r--r--gtk/gtkspinbutton.h4
-rw-r--r--gtk/gtkstatusbar.h4
-rwxr-xr-xgtk/gtkstatusicon.h4
-rw-r--r--gtk/gtkstock.h4
-rw-r--r--gtk/gtkstyle.h4
-rw-r--r--gtk/gtktable.h4
-rw-r--r--gtk/gtktearoffmenuitem.h4
-rw-r--r--gtk/gtktestutils.h5
-rw-r--r--gtk/gtktextbuffer.h4
-rw-r--r--gtk/gtktextbufferrichtext.h4
-rw-r--r--gtk/gtktextchild.h4
-rw-r--r--gtk/gtktextiter.h4
-rw-r--r--gtk/gtktextlayout.h3
-rw-r--r--gtk/gtktextmark.h4
-rw-r--r--gtk/gtktexttag.h4
-rw-r--r--gtk/gtktexttagprivate.h2
-rw-r--r--gtk/gtktexttagtable.h4
-rw-r--r--gtk/gtktexttypes.h4
-rw-r--r--gtk/gtktextview.h4
-rw-r--r--gtk/gtktipsquery.h3
-rw-r--r--gtk/gtktoggleaction.h5
-rw-r--r--gtk/gtktogglebutton.h4
-rw-r--r--gtk/gtktoggletoolbutton.h4
-rw-r--r--gtk/gtktoolbar.h4
-rw-r--r--gtk/gtktoolbutton.h4
-rw-r--r--gtk/gtktoolitem.h4
-rw-r--r--gtk/gtktoolshell.h4
-rw-r--r--gtk/gtktooltip.h4
-rw-r--r--gtk/gtktreedatalist.h5
-rw-r--r--gtk/gtktreednd.h4
-rw-r--r--gtk/gtktreemodel.h4
-rw-r--r--gtk/gtktreemodelfilter.h4
-rw-r--r--gtk/gtktreemodelsort.h4
-rw-r--r--gtk/gtktreeselection.h4
-rw-r--r--gtk/gtktreesortable.h4
-rw-r--r--gtk/gtktreestore.h4
-rw-r--r--gtk/gtktreeview.h5
-rw-r--r--gtk/gtktreeviewcolumn.h4
-rw-r--r--gtk/gtktypebuiltins.h.template4
-rw-r--r--gtk/gtktypeutils.h4
-rw-r--r--gtk/gtkuimanager.h5
-rw-r--r--gtk/gtkvbbox.h4
-rw-r--r--gtk/gtkvbox.h4
-rw-r--r--gtk/gtkversion.h.in4
-rw-r--r--gtk/gtkviewport.h4
-rw-r--r--gtk/gtkvolumebutton.h4
-rw-r--r--gtk/gtkvpaned.h4
-rw-r--r--gtk/gtkvruler.h4
-rw-r--r--gtk/gtkvscale.h4
-rw-r--r--gtk/gtkvscrollbar.h4
-rw-r--r--gtk/gtkvseparator.h4
-rw-r--r--gtk/gtkwidget.h4
-rw-r--r--gtk/gtkwindow.h4
207 files changed, 812 insertions, 69 deletions
diff --git a/ChangeLog b/ChangeLog
index 90db48a9fa..f246ec7b85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+2008-05-28 Michael Natterer <mitch@imendio.com>
+
+ * gtk/gtk.h: define __GTK_H_INSIDE__ around including all other
+ headers.
+
+ * gtk/gtktypebuiltins.h.template
+ * gtk/gtkversion.h.in
+ * gtk/gtk*.h: add single-include guards that #error out if
+ GTK_DISABLE_SINGLE_INCLUDES is defined and any of these files is
+ included individually.
+
+ * gtk/gtkprintbackend.h
+ * gtk/gtkprinter-private.h
+ * gtk/gtktextlayout.h
+ * gtk/gtktexttagprivate.h
+ * gtk/gtktexttypes.h
+ * gtk/gtktreedatalist.h: include <gtk/gtk.h> instead of individual
+ headers in these private or semi-private headers.
+
+ * gtk/gtkimmodule.h: also here because it's not in gtk.h.
+
+ * gtk/gtkpagesetupunixdialog.h
+ * gtk/gtkprinter.h
+ * gtk/gtkprintjob.h
+ * gtk/gtkprintunixdialog.h: likewise in the gtkunixprint headers.
+
+ * gtk/gtkclist.h
+ * gtk/gtkcombo.h
+ * gtk/gtkctree.h
+ * gtk/gtkfilesel.h
+ * gtk/gtkitemfactory.h
+ * gtk/gtklist.h
+ * gtk/gtklistitem.h
+ * gtk/gtkoldeditable.h
+ * gtk/gtkoptionmenu.h
+ * gtk/gtkpixmap.h
+ * gtk/gtkpreview.h
+ * gtk/gtksignal.h
+ * gtk/gtktipsquery.h: whenever possible, include only <gtk/gtk.h>
+ instead of individual headers in these deprecated headers. They
+ don't get included at all when GTK_DISABLE_DEPRECATED is defined,
+ so if an app needs them anyway, it must undef GTK_DISABLE_DEPRECATED
+ and include them individually, which should continue to work.
+
+ * gtk/gtkclist.c: include "gtkctree.h" because of the change
+ above.
+
2008-05-28 Kristian Rietveld <kris@imendio.com>
Bug 449625 - crash in gtk_tree_view_real_move_cursor at
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 7b6d5071fa..c3d7a4d197 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -27,6 +27,7 @@
#ifndef __GTK_H__
#define __GTK_H__
+#define __GTK_H_INSIDE__
#include <gdk/gdk.h>
#include <gtk/gtkaboutdialog.h>
@@ -231,5 +232,6 @@
#include <gtk/gtktipsquery.h>
#include <gtk/gtktooltips.h>
+#undef __GTK_H_INSIDE__
#endif /* __GTK_H__ */
diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h
index b77e658c19..bf471044c3 100644
--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@@ -22,6 +22,10 @@
Author: Anders Carlsson <andersca@codefactory.se>
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ABOUT_DIALOG_H__
#define __GTK_ABOUT_DIALOG_H__
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index 7e89ddf98a..d5ade0b32b 100644
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ACCEL_GROUP_H__
#define __GTK_ACCEL_GROUP_H__
diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h
index 4eb842a610..d831f553c5 100644
--- a/gtk/gtkaccellabel.h
+++ b/gtk/gtkaccellabel.h
@@ -27,6 +27,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ACCEL_LABEL_H__
#define __GTK_ACCEL_LABEL_H__
diff --git a/gtk/gtkaccelmap.h b/gtk/gtkaccelmap.h
index 932c893ab3..208704920b 100644
--- a/gtk/gtkaccelmap.h
+++ b/gtk/gtkaccelmap.h
@@ -16,6 +16,11 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ACCEL_MAP_H__
#define __GTK_ACCEL_MAP_H__
diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h
index ca8645be6a..6442b2b851 100644
--- a/gtk/gtkaccessible.h
+++ b/gtk/gtkaccessible.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ACCESSIBLE_H__
#define __GTK_ACCESSIBLE_H__
diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index bb15813524..02b77b39f2 100644
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -27,6 +27,11 @@
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ACTION_H__
#define __GTK_ACTION_H__
diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 73e9c43e79..2618e91a1d 100644
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -27,6 +27,11 @@
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ACTION_GROUP_H__
#define __GTK_ACTION_GROUP_H__
diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index 1fe3e4ae8b..ea37a9a420 100644
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ADJUSTMENT_H__
#define __GTK_ADJUSTMENT_H__
diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h
index df39c54184..5946c74f07 100644
--- a/gtk/gtkalignment.h
+++ b/gtk/gtkalignment.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ALIGNMENT_H__
#define __GTK_ALIGNMENT_H__
diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h
index 7692b77180..1911749ac7 100644
--- a/gtk/gtkarrow.h
+++ b/gtk/gtkarrow.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ARROW_H__
#define __GTK_ARROW_H__
diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
index e85888c6e1..3de843b47a 100644
--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ASPECT_FRAME_H__
#define __GTK_ASPECT_FRAME_H__
diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h
index cadffd0d58..92d290f623 100644
--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@@ -23,6 +23,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ASSISTANT_H__
#define __GTK_ASSISTANT_H__
diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h
index 1f69197ff9..4c4f58b280 100644
--- a/gtk/gtkbbox.h
+++ b/gtk/gtkbbox.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_BUTTON_BOX_H__
#define __GTK_BUTTON_BOX_H__
diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h
index c919c1d941..4e55bf21ce 100644
--- a/gtk/gtkbin.h
+++ b/gtk/gtkbin.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_BIN_H__
#define __GTK_BIN_H__
diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
index a3109b2988..73615adef7 100644
--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@@ -27,6 +27,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_BINDINGS_H__
#define __GTK_BINDINGS_H__
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index b4fec74938..abd6fdbc4f 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_BOX_H__
#define __GTK_BOX_H__
diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index 21fcc61147..73dbcbde01 100644
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_BUILDABLE_H__
#define __GTK_BUILDABLE_H__
diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h
index eb82a61f7f..b266bc6bca 100644
--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@@ -17,6 +17,11 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_BUILDER_H__
#define __GTK_BUILDER_H__
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index 3d66e01252..aaac546878 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_BUTTON_H__
#define __GTK_BUTTON_H__
diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h
index be62f1bc77..7071091574 100644
--- a/gtk/gtkcalendar.h
+++ b/gtk/gtkcalendar.h
@@ -26,6 +26,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CALENDAR_H__
#define __GTK_CALENDAR_H__
diff --git a/gtk/gtkcelleditable.h b/gtk/gtkcelleditable.h
index 10cde8e89d..74d6949ae0 100644
--- a/gtk/gtkcelleditable.h
+++ b/gtk/gtkcelleditable.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CELL_EDITABLE_H__
#define __GTK_CELL_EDITABLE_H__
diff --git a/gtk/gtkcelllayout.h b/gtk/gtkcelllayout.h
index 3f03687a10..b1e9fb8a81 100644
--- a/gtk/gtkcelllayout.h
+++ b/gtk/gtkcelllayout.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CELL_LAYOUT_H__
#define __GTK_CELL_LAYOUT_H__
diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index d8428623d6..06bc5c10a3 100644
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CELL_RENDERER_H__
#define __GTK_CELL_RENDERER_H__
diff --git a/gtk/gtkcellrendereraccel.h b/gtk/gtkcellrendereraccel.h
index d9fd1d1108..45c1cf6fc6 100644
--- a/gtk/gtkcellrendereraccel.h
+++ b/gtk/gtkcellrendereraccel.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CELL_RENDERER_ACCEL_H__
#define __GTK_CELL_RENDERER_ACCEL_H__
diff --git a/gtk/gtkcellrenderercombo.h b/gtk/gtkcellrenderercombo.h
index ade6b8a4f8..a3981e5f98 100644
--- a/gtk/gtkcellrenderercombo.h
+++ b/gtk/gtkcellrenderercombo.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CELL_RENDERER_COMBO_H__
#define __GTK_CELL_RENDERER_COMBO_H__
diff --git a/gtk/gtkcellrendererpixbuf.h b/gtk/gtkcellrendererpixbuf.h
index b479c9c752..7886f8e3b4 100644
--- a/gtk/gtkcellrendererpixbuf.h
+++ b/gtk/gtkcellrendererpixbuf.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CELL_RENDERER_PIXBUF_H__
#define __GTK_CELL_RENDERER_PIXBUF_H__
diff --git a/gtk/gtkcellrendererprogress.h b/gtk/gtkcellrendererprogress.h
index 6e84cd0e48..4bb4134c4b 100644
--- a/gtk/gtkcellrendererprogress.h
+++ b/gtk/gtkcellrendererprogress.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CELL_RENDERER_PROGRESS_H__
#define __GTK_CELL_RENDERER_PROGRESS_H__
diff --git a/gtk/gtkcellrendererspin.h b/gtk/gtkcellrendererspin.h
index a6f66ad9e2..b9f0bb1a6a 100644
--- a/gtk/gtkcellrendererspin.h
+++ b/gtk/gtkcellrendererspin.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CELL_RENDERER_SPIN_H__
#define __GTK_CELL_RENDERER_SPIN_H__
diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h
index fef52adf22..b6df6a084f 100644
--- a/gtk/gtkcellrenderertext.h
+++ b/gtk/gtkcellrenderertext.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CELL_RENDERER_TEXT_H__
#define __GTK_CELL_RENDERER_TEXT_H__
@@ -98,5 +102,4 @@ void gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRende
G_END_DECLS
-
#endif /* __GTK_CELL_RENDERER_TEXT_H__ */
diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h
index 302909bd60..500ea53a70 100644
--- a/gtk/gtkcellrenderertoggle.h
+++ b/gtk/gtkcellrenderertoggle.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CELL_RENDERER_TOGGLE_H__
#define __GTK_CELL_RENDERER_TOGGLE_H__
diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h
index 6a79c3aba4..790fc7fc27 100644
--- a/gtk/gtkcellview.h
+++ b/gtk/gtkcellview.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CELL_VIEW_H__
#define __GTK_CELL_VIEW_H__
diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h
index 106bf5463d..2e0a47f359 100644
--- a/gtk/gtkcheckbutton.h
+++ b/gtk/gtkcheckbutton.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CHECK_BUTTON_H__
#define __GTK_CHECK_BUTTON_H__
diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h
index 6db552fc61..c8dae31cd9 100644
--- a/gtk/gtkcheckmenuitem.h
+++ b/gtk/gtkcheckmenuitem.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CHECK_MENU_ITEM_H__
#define __GTK_CHECK_MENU_ITEM_H__
diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h
index 1825cf7670..5de4152793 100644
--- a/gtk/gtkclipboard.h
+++ b/gtk/gtkclipboard.h
@@ -19,6 +19,10 @@
* Global clipboard abstraction.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CLIPBOARD_H__
#define __GTK_CLIPBOARD_H__
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 81ac08c3c6..58297816c4 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -35,6 +35,7 @@
#include "gtkmain.h"
#include "gtkobject.h"
+#include "gtkctree.h"
#include "gtkclist.h"
#include "gtkbindings.h"
#include "gtkdnd.h"
diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h
index 030be7206d..9744119b71 100644
--- a/gtk/gtkclist.h
+++ b/gtk/gtkclist.h
@@ -30,15 +30,7 @@
#ifndef __GTK_CLIST_H__
#define __GTK_CLIST_H__
-#include <gdk/gdk.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkenums.h>
-
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h
index b6a00fdf4e..f9ee40e166 100644
--- a/gtk/gtkcolorbutton.h
+++ b/gtk/gtkcolorbutton.h
@@ -28,6 +28,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_COLOR_BUTTON_H__
#define __GTK_COLOR_BUTTON_H__
diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h
index 8cfc3c931a..34a271ce69 100644
--- a/gtk/gtkcolorsel.h
+++ b/gtk/gtkcolorsel.h
@@ -24,6 +24,11 @@
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_COLOR_SELECTION_H__
#define __GTK_COLOR_SELECTION_H__
diff --git a/gtk/gtkcolorseldialog.h b/gtk/gtkcolorseldialog.h
index 7ad0249117..3b9ad69f60 100644
--- a/gtk/gtkcolorseldialog.h
+++ b/gtk/gtkcolorseldialog.h
@@ -23,6 +23,11 @@
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_COLOR_SELECTION_DIALOG_H__
#define __GTK_COLOR_SELECTION_DIALOG_H__
diff --git a/gtk/gtkcombo.h b/gtk/gtkcombo.h
index 31655af3a4..c9c8b930c0 100644
--- a/gtk/gtkcombo.h
+++ b/gtk/gtkcombo.h
@@ -29,8 +29,8 @@
#ifndef __GTK_SMART_COMBO_H__
#define __GTK_SMART_COMBO_H__
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkitem.h>
+#include <gtk/gtk.h>
+
G_BEGIN_DECLS
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index 6ab2d95454..cfead42d0d 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_COMBO_BOX_H__
#define __GTK_COMBO_BOX_H__
diff --git a/gtk/gtkcomboboxentry.h b/gtk/gtkcomboboxentry.h
index 5fc71d10de..f243fc6a38 100644
--- a/gtk/gtkcomboboxentry.h
+++ b/gtk/gtkcomboboxentry.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_COMBO_BOX_ENTRY_H__
#define __GTK_COMBO_BOX_ENTRY_H__
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 612fe8bcbe..04ba4f9146 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CONTAINER_H__
#define __GTK_CONTAINER_H__
diff --git a/gtk/gtkctree.h b/gtk/gtkctree.h
index a67ee5f9a1..5d4ea5f9e5 100644
--- a/gtk/gtkctree.h
+++ b/gtk/gtkctree.h
@@ -33,7 +33,7 @@
#ifndef __GTK_CTREE_H__
#define __GTK_CTREE_H__
-#include <gtk/gtkclist.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkcurve.h b/gtk/gtkcurve.h
index 94c2c59b1b..09028fe13f 100644
--- a/gtk/gtkcurve.h
+++ b/gtk/gtkcurve.h
@@ -34,6 +34,10 @@
* distribution.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_CURVE_H__
#define __GTK_CURVE_H__
diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
index 5b148c8862..c4d9d55ec3 100644
--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_DEBUG_H__
#define __GTK_DEBUG_H__
diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index 0b6b65c158..4115f9a855 100644
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_DIALOG_H__
#define __GTK_DIALOG_H__
diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index f9119060b5..740a2e459c 100644
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -25,6 +25,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_DND_H__
#define __GTK_DND_H__
diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h
index fd445e16ac..61c2a5333a 100644
--- a/gtk/gtkdrawingarea.h
+++ b/gtk/gtkdrawingarea.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_DRAWING_AREA_H__
#define __GTK_DRAWING_AREA_H__
diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h
index 46de8150ef..e3cab269e1 100644
--- a/gtk/gtkeditable.h
+++ b/gtk/gtkeditable.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_EDITABLE_H__
#define __GTK_EDITABLE_H__
diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index c8c80429d8..b08c56e395 100644
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ENTRY_H__
#define __GTK_ENTRY_H__
diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h
index 19cacc8507..0086ce568f 100644
--- a/gtk/gtkentrycompletion.h
+++ b/gtk/gtkentrycompletion.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ENTRY_COMPLETION_H__
#define __GTK_ENTRY_COMPLETION_H__
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index 4fdc7fd3cd..4be6d648bf 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ENUMS_H__
#define __GTK_ENUMS_H__
diff --git a/gtk/gtkeventbox.h b/gtk/gtkeventbox.h
index 3fba8b4b6f..b5c7e54737 100644
--- a/gtk/gtkeventbox.h
+++ b/gtk/gtkeventbox.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_EVENT_BOX_H__
#define __GTK_EVENT_BOX_H__
diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h
index e5bfa45440..97163dc5c1 100644
--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@@ -21,6 +21,10 @@
* Mark McLoughlin <mark@skynet.ie>
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_EXPANDER_H__
#define __GTK_EXPANDER_H__
diff --git a/gtk/gtkfilechooser.h b/gtk/gtkfilechooser.h
index 5b233878b3..63a7c6f11b 100644
--- a/gtk/gtkfilechooser.h
+++ b/gtk/gtkfilechooser.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_FILE_CHOOSER_H__
#define __GTK_FILE_CHOOSER_H__
diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h
index d2d24deeed..761153332a 100644
--- a/gtk/gtkfilechooserbutton.h
+++ b/gtk/gtkfilechooserbutton.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_FILE_CHOOSER_BUTTON_H__
#define __GTK_FILE_CHOOSER_BUTTON_H__
diff --git a/gtk/gtkfilechooserdialog.h b/gtk/gtkfilechooserdialog.h
index 0b410e1a90..f1ed3301c2 100644
--- a/gtk/gtkfilechooserdialog.h
+++ b/gtk/gtkfilechooserdialog.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_FILE_CHOOSER_DIALOG_H__
#define __GTK_FILE_CHOOSER_DIALOG_H__
diff --git a/gtk/gtkfilechooserwidget.h b/gtk/gtkfilechooserwidget.h
index 194acb3be8..8de57e675a 100644
--- a/gtk/gtkfilechooserwidget.h
+++ b/gtk/gtkfilechooserwidget.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_FILE_CHOOSER_WIDGET_H__
#define __GTK_FILE_CHOOSER_WIDGET_H__
diff --git a/gtk/gtkfilefilter.h b/gtk/gtkfilefilter.h
index fd074f87ec..737ad5857f 100644
--- a/gtk/gtkfilefilter.h
+++ b/gtk/gtkfilefilter.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_FILE_FILTER_H__
#define __GTK_FILE_FILTER_H__
diff --git a/gtk/gtkfilesel.h b/gtk/gtkfilesel.h
index 75f65a16d1..8823566872 100644
--- a/gtk/gtkfilesel.h
+++ b/gtk/gtkfilesel.h
@@ -29,9 +29,7 @@
#ifndef __GTK_FILESEL_H__
#define __GTK_FILESEL_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h
index a313568cc8..cfe3c5e8af 100644
--- a/gtk/gtkfixed.h
+++ b/gtk/gtkfixed.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_FIXED_H__
#define __GTK_FIXED_H__
diff --git a/gtk/gtkfontbutton.h b/gtk/gtkfontbutton.h
index 8952569b90..f7bd19fe80 100644
--- a/gtk/gtkfontbutton.h
+++ b/gtk/gtkfontbutton.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_FONT_BUTTON_H__
#define __GTK_FONT_BUTTON_H__
diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h
index f41339910d..8469033786 100644
--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@@ -28,6 +28,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_FONTSEL_H__
#define __GTK_FONTSEL_H__
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 85729d13c0..dc24cf5c5c 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_FRAME_H__
#define __GTK_FRAME_H__
diff --git a/gtk/gtkgamma.h b/gtk/gtkgamma.h
index fa6999b372..328b6f9342 100644
--- a/gtk/gtkgamma.h
+++ b/gtk/gtkgamma.h
@@ -34,6 +34,10 @@
* distribution.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_GAMMA_CURVE_H__
#define __GTK_GAMMA_CURVE_H__
diff --git a/gtk/gtkgc.h b/gtk/gtkgc.h
index 38d70a6bb7..4d5f6ffb04 100644
--- a/gtk/gtkgc.h
+++ b/gtk/gtkgc.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_GC_H__
#define __GTK_GC_H__
diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h
index c690a04b16..8409f44f0b 100644
--- a/gtk/gtkhandlebox.h
+++ b/gtk/gtkhandlebox.h
@@ -29,6 +29,9 @@
* their parents.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
#ifndef __GTK_HANDLE_BOX_H__
#define __GTK_HANDLE_BOX_H__
diff --git a/gtk/gtkhbbox.h b/gtk/gtkhbbox.h
index 7423a7547b..04bf6c753c 100644
--- a/gtk/gtkhbbox.h
+++ b/gtk/gtkhbbox.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_HBUTTON_BOX_H__
#define __GTK_HBUTTON_BOX_H__
diff --git a/gtk/gtkhbox.h b/gtk/gtkhbox.h
index 5296e21e3c..41a5dff8ad 100644
--- a/gtk/gtkhbox.h
+++ b/gtk/gtkhbox.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_HBOX_H__
#define __GTK_HBOX_H__
diff --git a/gtk/gtkhpaned.h b/gtk/gtkhpaned.h
index 2272dfd4a7..54fdcdb3d8 100644
--- a/gtk/gtkhpaned.h
+++ b/gtk/gtkhpaned.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_HPANED_H__
#define __GTK_HPANED_H__
diff --git a/gtk/gtkhruler.h b/gtk/gtkhruler.h
index 375b808644..b13867c3b7 100644
--- a/gtk/gtkhruler.h
+++ b/gtk/gtkhruler.h
@@ -34,6 +34,10 @@
* distribution.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_HRULER_H__
#define __GTK_HRULER_H__
diff --git a/gtk/gtkhscale.h b/gtk/gtkhscale.h
index 6f41090774..d2e243d9f8 100644
--- a/gtk/gtkhscale.h
+++ b/gtk/gtkhscale.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_HSCALE_H__
#define __GTK_HSCALE_H__
diff --git a/gtk/gtkhscrollbar.h b/gtk/gtkhscrollbar.h
index a6f595ba98..3aff419e9f 100644
--- a/gtk/gtkhscrollbar.h
+++ b/gtk/gtkhscrollbar.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_HSCROLLBAR_H__
#define __GTK_HSCROLLBAR_H__
diff --git a/gtk/gtkhseparator.h b/gtk/gtkhseparator.h
index 008a2fe403..2f3abefa63 100644
--- a/gtk/gtkhseparator.h
+++ b/gtk/gtkhseparator.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_HSEPARATOR_H__
#define __GTK_HSEPARATOR_H__
diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index 1bcbcb40dd..381ac7e6ce 100644
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ICON_FACTORY_H__
#define __GTK_ICON_FACTORY_H__
diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index f1c20a23e1..015000dc55 100644
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ICON_THEME_H__
#define __GTK_ICON_THEME_H__
diff --git a/gtk/gtkiconview.h b/gtk/gtkiconview.h
index 66acd5fdd5..68d8628f86 100644
--- a/gtk/gtkiconview.h
+++ b/gtk/gtkiconview.h
@@ -16,6 +16,11 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ICON_VIEW_H__
#define __GTK_ICON_VIEW_H__
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index e1b061cca3..695d39f08b 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_IMAGE_H__
#define __GTK_IMAGE_H__
diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h
index f70df311a8..0485657e6c 100644
--- a/gtk/gtkimagemenuitem.h
+++ b/gtk/gtkimagemenuitem.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_IMAGE_MENU_ITEM_H__
#define __GTK_IMAGE_MENU_ITEM_H__
diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h
index 47063c03ea..b1f3575ad6 100644
--- a/gtk/gtkimcontext.h
+++ b/gtk/gtkimcontext.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_IM_CONTEXT_H__
#define __GTK_IM_CONTEXT_H__
diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h
index 1378c43d19..fb0eadf913 100644
--- a/gtk/gtkimcontextsimple.h
+++ b/gtk/gtkimcontextsimple.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_IM_CONTEXT_SIMPLE_H__
#define __GTK_IM_CONTEXT_SIMPLE_H__
diff --git a/gtk/gtkimmodule.h b/gtk/gtkimmodule.h
index 353d532928..794b36fcfc 100644
--- a/gtk/gtkimmodule.h
+++ b/gtk/gtkimmodule.h
@@ -20,7 +20,7 @@
#ifndef __GTK_IM_MODULE_H__
#define __GTK_IM_MODULE_H__
-#include <gtk/gtkimcontext.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h
index aa410f172c..635a24ece1 100644
--- a/gtk/gtkimmulticontext.h
+++ b/gtk/gtkimmulticontext.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_IM_MULTICONTEXT_H__
#define __GTK_IM_MULTICONTEXT_H__
diff --git a/gtk/gtkinputdialog.h b/gtk/gtkinputdialog.h
index 1a1a648994..f24d75514a 100644
--- a/gtk/gtkinputdialog.h
+++ b/gtk/gtkinputdialog.h
@@ -34,6 +34,10 @@
* distribution.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_INPUTDIALOG_H__
#define __GTK_INPUTDIALOG_H__
diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h
index ad0ad4c230..be12be0a6a 100644
--- a/gtk/gtkinvisible.h
+++ b/gtk/gtkinvisible.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_INVISIBLE_H__
#define __GTK_INVISIBLE_H__
diff --git a/gtk/gtkitem.h b/gtk/gtkitem.h
index 01ca95c190..1f78b26d3e 100644
--- a/gtk/gtkitem.h
+++ b/gtk/gtkitem.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_ITEM_H__
#define __GTK_ITEM_H__
diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h
index 009992f125..d78483f1d2 100644
--- a/gtk/gtkitemfactory.h
+++ b/gtk/gtkitemfactory.h
@@ -32,8 +32,8 @@
#ifndef __GTK_ITEM_FACTORY_H__
#define __GTK_ITEM_FACTORY_H__
+#include <gtk/gtk.h>
-#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 5656ebbf8f..5d0d124737 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -23,6 +23,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_LABEL_H__
#define __GTK_LABEL_H__
diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index ffd8b45daa..a38ade2559 100644
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -28,6 +28,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_LAYOUT_H__
#define __GTK_LAYOUT_H__
diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h
index 24e79b460c..be3328de81 100644
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -22,6 +22,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Cambridge, MA 02139, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_LINK_BUTTON_H__
#define __GTK_LINK_BUTTON_H__
diff --git a/gtk/gtklist.h b/gtk/gtklist.h
index 4023f2e74d..08154859bb 100644
--- a/gtk/gtklist.h
+++ b/gtk/gtklist.h
@@ -29,11 +29,7 @@
#ifndef __GTK_LIST_H__
#define __GTK_LIST_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtklistitem.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtklistitem.h b/gtk/gtklistitem.h
index 9738bce416..545765d047 100644
--- a/gtk/gtklistitem.h
+++ b/gtk/gtklistitem.h
@@ -29,9 +29,7 @@
#ifndef __GTK_LIST_ITEM_H__
#define __GTK_LIST_ITEM_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkitem.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 9aeb81b3c4..8e3ece76ab 100644
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_LIST_STORE_H__
#define __GTK_LIST_STORE_H__
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 15d08cbe3c..6356624c17 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_MAIN_H__
#define __GTK_MAIN_H__
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index ba4c8013d4..1bea241953 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_MENU_H__
#define __GTK_MENU_H__
diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h
index 53fba835fb..2c3810c161 100644
--- a/gtk/gtkmenubar.h
+++ b/gtk/gtkmenubar.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_MENU_BAR_H__
#define __GTK_MENU_BAR_H__
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 4da800edbb..bda03f2967 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_MENU_ITEM_H__
#define __GTK_MENU_ITEM_H__
diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h
index 2595a74ff0..742788293c 100644
--- a/gtk/gtkmenushell.h
+++ b/gtk/gtkmenushell.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_MENU_SHELL_H__
#define __GTK_MENU_SHELL_H__
diff --git a/gtk/gtkmenutoolbutton.h b/gtk/gtkmenutoolbutton.h
index 4eb860e317..8c8f046f13 100644
--- a/gtk/gtkmenutoolbutton.h
+++ b/gtk/gtkmenutoolbutton.h
@@ -19,6 +19,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_MENU_TOOL_BUTTON_H__
#define __GTK_MENU_TOOL_BUTTON_H__
diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h
index dbf17d2bd6..48f428ff37 100644
--- a/gtk/gtkmessagedialog.h
+++ b/gtk/gtkmessagedialog.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
/* GTK - The GIMP Toolkit
* Copyright (C) 2000 Red Hat, Inc.
*
@@ -25,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_MESSAGE_DIALOG_H__
#define __GTK_MESSAGE_DIALOG_H__
diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h
index 3bc638ae9f..20a53786ff 100644
--- a/gtk/gtkmisc.h
+++ b/gtk/gtkmisc.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_MISC_H__
#define __GTK_MISC_H__
diff --git a/gtk/gtkmodules.h b/gtk/gtkmodules.h
index bd157f79a7..2ea4d8b4b4 100644
--- a/gtk/gtkmodules.h
+++ b/gtk/gtkmodules.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_MODULES_H__
#define __GTK_MODULES_H__
diff --git a/gtk/gtkmountoperation.h b/gtk/gtkmountoperation.h
index 9299726538..7d93e65776 100644
--- a/gtk/gtkmountoperation.h
+++ b/gtk/gtkmountoperation.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_MOUNT_OPERATION_H__
#define __GTK_MOUNT_OPERATION_H__
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index 887704a221..489918a71b 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -25,6 +25,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_NOTEBOOK_H__
#define __GTK_NOTEBOOK_H__
diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h
index 22d4bf4b2c..64b1ee781f 100644
--- a/gtk/gtkobject.h
+++ b/gtk/gtkobject.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_OBJECT_H__
#define __GTK_OBJECT_H__
diff --git a/gtk/gtkoldeditable.h b/gtk/gtkoldeditable.h
index da6d90c368..50fa9ea5c9 100644
--- a/gtk/gtkoldeditable.h
+++ b/gtk/gtkoldeditable.h
@@ -29,10 +29,8 @@
#ifndef __GTK_OLD_EDITABLE_H__
#define __GTK_OLD_EDITABLE_H__
+#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkoptionmenu.h b/gtk/gtkoptionmenu.h
index 32f6de9f03..8521020edd 100644
--- a/gtk/gtkoptionmenu.h
+++ b/gtk/gtkoptionmenu.h
@@ -29,9 +29,7 @@
#ifndef __GTK_OPTION_MENU_H__
#define __GTK_OPTION_MENU_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h
index e73908195f..c96c701978 100644
--- a/gtk/gtkpagesetup.h
+++ b/gtk/gtkpagesetup.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_PAGE_SETUP_H__
#define __GTK_PAGE_SETUP_H__
diff --git a/gtk/gtkpagesetupunixdialog.h b/gtk/gtkpagesetupunixdialog.h
index a99a07d6ee..949357201c 100644
--- a/gtk/gtkpagesetupunixdialog.h
+++ b/gtk/gtkpagesetupunixdialog.h
@@ -16,12 +16,11 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
#ifndef __GTK_PAGE_SETUP_UNIX_DIALOG_H__
#define __GTK_PAGE_SETUP_UNIX_DIALOG_H__
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkpagesetup.h>
-#include <gtk/gtkprintsettings.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h
index 003316aef7..dd40220f8b 100644
--- a/gtk/gtkpaned.h
+++ b/gtk/gtkpaned.h
@@ -25,6 +25,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_PANED_H__
#define __GTK_PANED_H__
diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h
index 65aed126fd..24aae93175 100644
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_PAPER_SIZE_H__
#define __GTK_PAPER_SIZE_H__
diff --git a/gtk/gtkpixmap.h b/gtk/gtkpixmap.h
index 1bb4f85434..747a04d957 100644
--- a/gtk/gtkpixmap.h
+++ b/gtk/gtkpixmap.h
@@ -29,9 +29,7 @@
#ifndef __GTK_PIXMAP_H__
#define __GTK_PIXMAP_H__
-
-#include <gdk/gdk.h>
-#include <gtk/gtkmisc.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index 87fe6f92fd..bb4302c653 100644
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -23,6 +23,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_PLUG_H__
#define __GTK_PLUG_H__
diff --git a/gtk/gtkpreview.h b/gtk/gtkpreview.h
index a13617e491..e4b211d71c 100644
--- a/gtk/gtkpreview.h
+++ b/gtk/gtkpreview.h
@@ -29,8 +29,7 @@
#ifndef __GTK_PREVIEW_H__
#define __GTK_PREVIEW_H__
-
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkprintbackend.h b/gtk/gtkprintbackend.h
index 81c549844a..45afe7b057 100644
--- a/gtk/gtkprintbackend.h
+++ b/gtk/gtkprintbackend.h
@@ -29,10 +29,9 @@
#error "GtkPrintBackend is not supported API for general use"
#endif
-#include <glib-object.h>
#include <cairo.h>
+#include <gtk/gtk.h>
-#include "gtkprintsettings.h"
#include "gtkprinteroptionset.h"
#include "gtkprintjob.h"
diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h
index f754ecdd1d..6350a3ca94 100644
--- a/gtk/gtkprintcontext.h
+++ b/gtk/gtkprintcontext.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_PRINT_CONTEXT_H__
#define __GTK_PRINT_CONTEXT_H__
diff --git a/gtk/gtkprinter-private.h b/gtk/gtkprinter-private.h
index 26146a10a6..c5faece1b5 100644
--- a/gtk/gtkprinter-private.h
+++ b/gtk/gtkprinter-private.h
@@ -21,11 +21,9 @@
#ifndef __GTK_PRINTER_PRIVATE_H__
#define __GTK_PRINTER_PRIVATE_H__
-#include <glib.h>
+#include <gtk/gtk.h>
#include "gtkprinter.h"
-#include "gtkprintoperation.h"
#include "gtkprinteroptionset.h"
-#include "gtkpagesetup.h"
#include "gtkprintjob.h"
G_BEGIN_DECLS
diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h
index 1152f88f6a..7379c6b3fe 100644
--- a/gtk/gtkprinter.h
+++ b/gtk/gtkprinter.h
@@ -16,13 +16,12 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
#ifndef __GTK_PRINTER_H__
#define __GTK_PRINTER_H__
-#include <glib-object.h>
#include <cairo.h>
-#include <gtk/gtkprintsettings.h>
-#include <gtk/gtkpagesetup.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h
index 89a3d5bc4c..bf192a5f70 100644
--- a/gtk/gtkprintjob.h
+++ b/gtk/gtkprintjob.h
@@ -16,14 +16,14 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
#ifndef __GTK_PRINT_JOB_H__
#define __GTK_PRINT_JOB_H__
-#include <glib-object.h>
#include <cairo.h>
+#include <gtk/gtk.h>
#include <gtk/gtkprinter.h>
-#include <gtk/gtkprintoperation.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index d0d3a38647..a1e24726e9 100644
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_PRINT_OPERATION_H__
#define __GTK_PRINT_OPERATION_H__
diff --git a/gtk/gtkprintoperationpreview.h b/gtk/gtkprintoperationpreview.h
index d2922bf938..603dea39c5 100644
--- a/gtk/gtkprintoperationpreview.h
+++ b/gtk/gtkprintoperationpreview.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_PRINT_OPERATION_PREVIEW_H__
#define __GTK_PRINT_OPERATION_PREVIEW_H__
diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h
index 09ba0b466a..f41bf5cb35 100644
--- a/gtk/gtkprintsettings.h
+++ b/gtk/gtkprintsettings.h
@@ -17,6 +17,11 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_PRINT_SETTINGS_H__
#define __GTK_PRINT_SETTINGS_H__
diff --git a/gtk/gtkprintunixdialog.h b/gtk/gtkprintunixdialog.h
index b6ad921a4e..d4fd6a2d57 100644
--- a/gtk/gtkprintunixdialog.h
+++ b/gtk/gtkprintunixdialog.h
@@ -16,14 +16,13 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
#ifndef __GTK_PRINT_UNIX_DIALOG_H__
#define __GTK_PRINT_UNIX_DIALOG_H__
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
#include <gtk/gtkprinter.h>
#include <gtk/gtkprintjob.h>
-#include <gtk/gtkprintsettings.h>
-#include <gtk/gtkpagesetup.h>
G_BEGIN_DECLS
diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index 1e55616476..6a374ae118 100644
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_PROGRESS_BAR_H__
#define __GTK_PROGRESS_BAR_H__
diff --git a/gtk/gtkradioaction.h b/gtk/gtkradioaction.h
index d39648b458..89692851a9 100644
--- a/gtk/gtkradioaction.h
+++ b/gtk/gtkradioaction.h
@@ -27,6 +27,11 @@
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_RADIO_ACTION_H__
#define __GTK_RADIO_ACTION_H__
diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h
index 0d885e63aa..378f8c9c3f 100644
--- a/gtk/gtkradiobutton.h
+++ b/gtk/gtkradiobutton.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_RADIO_BUTTON_H__
#define __GTK_RADIO_BUTTON_H__
diff --git a/gtk/gtkradiomenuitem.h b/gtk/gtkradiomenuitem.h
index 2adb5636d0..b5095ec6d3 100644
--- a/gtk/gtkradiomenuitem.h
+++ b/gtk/gtkradiomenuitem.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_RADIO_MENU_ITEM_H__
#define __GTK_RADIO_MENU_ITEM_H__
diff --git a/gtk/gtkradiotoolbutton.h b/gtk/gtkradiotoolbutton.h
index febdcf777a..32d0e7b6a0 100644
--- a/gtk/gtkradiotoolbutton.h
+++ b/gtk/gtkradiotoolbutton.h
@@ -20,6 +20,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_RADIO_TOOL_BUTTON_H__
#define __GTK_RADIO_TOOL_BUTTON_H__
diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index 7ebb9df677..efdff78533 100644
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_RANGE_H__
#define __GTK_RANGE_H__
diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h
index c6880af272..d3b3b9974f 100644
--- a/gtk/gtkrc.h
+++ b/gtk/gtkrc.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_RC_H__
#define __GTK_RC_H__
diff --git a/gtk/gtkrecentaction.h b/gtk/gtkrecentaction.h
index 776f942654..a2a41b0a38 100644
--- a/gtk/gtkrecentaction.h
+++ b/gtk/gtkrecentaction.h
@@ -19,6 +19,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_RECENT_ACTION_H__
#define __GTK_RECENT_ACTION_H__
diff --git a/gtk/gtkrecentchooser.h b/gtk/gtkrecentchooser.h
index 738a9b676a..a30b78f69e 100644
--- a/gtk/gtkrecentchooser.h
+++ b/gtk/gtkrecentchooser.h
@@ -19,6 +19,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_RECENT_CHOOSER_H__
#define __GTK_RECENT_CHOOSER_H__
diff --git a/gtk/gtkrecentchooserdialog.h b/gtk/gtkrecentchooserdialog.h
index 22be218d0b..e522de35b8 100644
--- a/gtk/gtkrecentchooserdialog.h
+++ b/gtk/gtkrecentchooserdialog.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_RECENT_CHOOSER_DIALOG_H__
#define __GTK_RECENT_CHOOSER_DIALOG_H__
diff --git a/gtk/gtkrecentchoosermenu.h b/gtk/gtkrecentchoosermenu.h
index 200233f9ee..5438ed4798 100644
--- a/gtk/gtkrecentchoosermenu.h
+++ b/gtk/gtkrecentchoosermenu.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_RECENT_CHOOSER_MENU_H__
#define __GTK_RECENT_CHOOSER_MENU_H__
diff --git a/gtk/gtkrecentchooserwidget.h b/gtk/gtkrecentchooserwidget.h
index 96aea95f1f..04be3e5020 100644
--- a/gtk/gtkrecentchooserwidget.h
+++ b/gtk/gtkrecentchooserwidget.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_RECENT_CHOOSER_WIDGET_H__
#define __GTK_RECENT_CHOOSER_WIDGET_H__
diff --git a/gtk/gtkrecentfilter.h b/gtk/gtkrecentfilter.h
index 28f6fe7aa7..3f868e4042 100644
--- a/gtk/gtkrecentfilter.h
+++ b/gtk/gtkrecentfilter.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_RECENT_FILTER_H__
#define __GTK_RECENT_FILTER_H__
diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h
index 11aeda88a0..5b89774407 100644
--- a/gtk/gtkrecentmanager.h
+++ b/gtk/gtkrecentmanager.h
@@ -18,6 +18,10 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_RECENT_MANAGER_H__
#define __GTK_RECENT_MANAGER_H__
diff --git a/gtk/gtkruler.h b/gtk/gtkruler.h
index 7b8fe529e9..efb30c6316 100644
--- a/gtk/gtkruler.h
+++ b/gtk/gtkruler.h
@@ -34,6 +34,10 @@
* distribution.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_RULER_H__
#define __GTK_RULER_H__
diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index b249c290f9..f61d42c1c1 100644
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_SCALE_H__
#define __GTK_SCALE_H__
diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h
index 19ca71eec2..a8ea99319c 100644
--- a/gtk/gtkscalebutton.h
+++ b/gtk/gtkscalebutton.h
@@ -33,6 +33,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_SCALE_BUTTON_H__
#define __GTK_SCALE_BUTTON_H__
diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h
index 2fb94e86f4..2c7b3f7a90 100644
--- a/gtk/gtkscrollbar.h
+++ b/gtk/gtkscrollbar.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_SCROLLBAR_H__
#define __GTK_SCROLLBAR_H__
diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index c9668f3750..6a3831e901 100644
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_SCROLLED_WINDOW_H__
#define __GTK_SCROLLED_WINDOW_H__
diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index 9e97ae2a6d..6fe4dd7ca5 100644
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_SELECTION_H__
#define __GTK_SELECTION_H__
diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h
index 5ea3564431..24af13fa04 100644
--- a/gtk/gtkseparator.h
+++ b/gtk/gtkseparator.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_SEPARATOR_H__
#define __GTK_SEPARATOR_H__
diff --git a/gtk/gtkseparatormenuitem.h b/gtk/gtkseparatormenuitem.h
index fe4f96bf80..2bf61ab68b 100644
--- a/gtk/gtkseparatormenuitem.h
+++ b/gtk/gtkseparatormenuitem.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_SEPARATOR_MENU_ITEM_H__
#define __GTK_SEPARATOR_MENU_ITEM_H__
diff --git a/gtk/gtkseparatortoolitem.h b/gtk/gtkseparatortoolitem.h
index 55e404be6f..6f7788b5a0 100644
--- a/gtk/gtkseparatortoolitem.h
+++ b/gtk/gtkseparatortoolitem.h
@@ -19,6 +19,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_SEPARATOR_TOOL_ITEM_H__
#define __GTK_SEPARATOR_TOOL_ITEM_H__
diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h
index f058e00a68..ffab06c31e 100644
--- a/gtk/gtksettings.h
+++ b/gtk/gtksettings.h
@@ -15,6 +15,11 @@
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_SETTINGS_H__
#define __GTK_SETTINGS_H__
diff --git a/gtk/gtkshow.h b/gtk/gtkshow.h
index 02e25f686f..5d83d68645 100644
--- a/gtk/gtkshow.h
+++ b/gtk/gtkshow.h
@@ -20,6 +20,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_SHOW_H__
#define __GTK_SHOW_H__
diff --git a/gtk/gtksignal.h b/gtk/gtksignal.h
index 8f33207e66..79e42e8a0e 100644
--- a/gtk/gtksignal.h
+++ b/gtk/gtksignal.h
@@ -29,9 +29,7 @@
#ifndef __GTK_SIGNAL_H__
#define __GTK_SIGNAL_H__
-#include <gtk/gtkenums.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkmarshal.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h
index 4a8315381e..404fe20845 100644
--- a/gtk/gtksizegroup.h
+++ b/gtk/gtksizegroup.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_SIZE_GROUP_H__
#define __GTK_SIZE_GROUP_H__
diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index c522e5ba09..04c977eea0 100644
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -23,6 +23,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_SOCKET_H__
#define __GTK_SOCKET_H__
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index 4bf3570c2b..cef9a53a4c 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -27,6 +27,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_SPIN_BUTTON_H__
#define __GTK_SPIN_BUTTON_H__
diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h
index 4702533130..9f419ca8c1 100644
--- a/gtk/gtkstatusbar.h
+++ b/gtk/gtkstatusbar.h
@@ -25,6 +25,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_STATUSBAR_H__
#define __GTK_STATUSBAR_H__
diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h
index e58eb6adb1..d372509a33 100755
--- a/gtk/gtkstatusicon.h
+++ b/gtk/gtkstatusicon.h
@@ -21,6 +21,10 @@
* Mark McLoughlin <mark@skynet.ie>
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_STATUS_ICON_H__
#define __GTK_STATUS_ICON_H__
diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h
index 5a7408b5cd..f250a0c404 100644
--- a/gtk/gtkstock.h
+++ b/gtk/gtkstock.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_STOCK_H__
#define __GTK_STOCK_H__
diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 0b95f8c0f6..e9b9008905 100644
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_STYLE_H__
#define __GTK_STYLE_H__
diff --git a/gtk/gtktable.h b/gtk/gtktable.h
index f925d330da..a7cd31d477 100644
--- a/gtk/gtktable.h
+++ b/gtk/gtktable.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TABLE_H__
#define __GTK_TABLE_H__
diff --git a/gtk/gtktearoffmenuitem.h b/gtk/gtktearoffmenuitem.h
index cd744b0d43..88d28da271 100644
--- a/gtk/gtktearoffmenuitem.h
+++ b/gtk/gtktearoffmenuitem.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TEAROFF_MENU_ITEM_H__
#define __GTK_TEAROFF_MENU_ITEM_H__
diff --git a/gtk/gtktestutils.h b/gtk/gtktestutils.h
index 59aa2af4e6..f0950de2f3 100644
--- a/gtk/gtktestutils.h
+++ b/gtk/gtktestutils.h
@@ -17,6 +17,11 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TEST_UTILS_H__
#define __GTK_TEST_UTILS_H__
diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index 9a0eb9d28e..34d2918ab5 100644
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TEXT_BUFFER_H__
#define __GTK_TEXT_BUFFER_H__
diff --git a/gtk/gtktextbufferrichtext.h b/gtk/gtktextbufferrichtext.h
index 96fc3c969b..bbbf6e2b0d 100644
--- a/gtk/gtktextbufferrichtext.h
+++ b/gtk/gtktextbufferrichtext.h
@@ -19,6 +19,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TEXT_BUFFER_RICH_TEXT_H__
#define __GTK_TEXT_BUFFER_RICH_TEXT_H__
diff --git a/gtk/gtktextchild.h b/gtk/gtktextchild.h
index 19c3ad9a3f..71dad60b4e 100644
--- a/gtk/gtktextchild.h
+++ b/gtk/gtktextchild.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TEXT_CHILD_H__
#define __GTK_TEXT_CHILD_H__
diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index f788397f55..44ba8721e7 100644
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TEXT_ITER_H__
#define __GTK_TEXT_ITER_H__
diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h
index cb35786454..a2e8aa3a5d 100644
--- a/gtk/gtktextlayout.h
+++ b/gtk/gtktextlayout.h
@@ -89,8 +89,7 @@
#error "You are not supposed to be including this file; the equivalent public API is in gtktextview.h"
#endif
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextiter.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h
index 41bcb9492f..7eb80f0599 100644
--- a/gtk/gtktextmark.h
+++ b/gtk/gtktextmark.h
@@ -47,6 +47,10 @@
*
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TEXT_MARK_H__
#define __GTK_TEXT_MARK_H__
diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index 61d60d9afe..4123768a4a 100644
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -47,6 +47,10 @@
*
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TEXT_TAG_H__
#define __GTK_TEXT_TAG_H__
diff --git a/gtk/gtktexttagprivate.h b/gtk/gtktexttagprivate.h
index a7547005ac..b3363d9250 100644
--- a/gtk/gtktexttagprivate.h
+++ b/gtk/gtktexttagprivate.h
@@ -27,7 +27,7 @@
#ifndef __GTK_TEXT_TAG_PRIVATE_H__
#define __GTK_TEXT_TAG_PRIVATE_H__
-#include <gtk/gtktexttag.h>
+#include <gtk/gtk.h>
typedef struct _GtkTextBTreeNode GtkTextBTreeNode;
diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h
index 6582c7ec01..fe780dcdd8 100644
--- a/gtk/gtktexttagtable.h
+++ b/gtk/gtktexttagtable.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TEXT_TAG_TABLE_H__
#define __GTK_TEXT_TAG_TABLE_H__
diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h
index 3324ec9edc..c624aeaf3a 100644
--- a/gtk/gtktexttypes.h
+++ b/gtk/gtktexttypes.h
@@ -27,9 +27,7 @@
#ifndef __GTK_TEXT_TYPES_H__
#define __GTK_TEXT_TYPES_H__
-#include <glib.h>
-
-#include <gtk/gtktextbuffer.h>
+#include <gtk/gtk.h>
#include <gtk/gtktexttagprivate.h>
G_BEGIN_DECLS
diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h
index d5223118e5..d7089da956 100644
--- a/gtk/gtktextview.h
+++ b/gtk/gtktextview.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TEXT_VIEW_H__
#define __GTK_TEXT_VIEW_H__
diff --git a/gtk/gtktipsquery.h b/gtk/gtktipsquery.h
index 2a09baed14..824480ce5f 100644
--- a/gtk/gtktipsquery.h
+++ b/gtk/gtktipsquery.h
@@ -32,8 +32,7 @@
#ifndef __GTK_TIPS_QUERY_H__
#define __GTK_TIPS_QUERY_H__
-
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/gtk/gtktoggleaction.h b/gtk/gtktoggleaction.h
index 6325c35ba6..369eba84d4 100644
--- a/gtk/gtktoggleaction.h
+++ b/gtk/gtktoggleaction.h
@@ -27,6 +27,11 @@
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TOGGLE_ACTION_H__
#define __GTK_TOGGLE_ACTION_H__
diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h
index c5bb68e3e9..433ba92c48 100644
--- a/gtk/gtktogglebutton.h
+++ b/gtk/gtktogglebutton.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TOGGLE_BUTTON_H__
#define __GTK_TOGGLE_BUTTON_H__
diff --git a/gtk/gtktoggletoolbutton.h b/gtk/gtktoggletoolbutton.h
index 1d747d5a16..cc0c85693e 100644
--- a/gtk/gtktoggletoolbutton.h
+++ b/gtk/gtktoggletoolbutton.h
@@ -20,6 +20,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TOGGLE_TOOL_BUTTON_H__
#define __GTK_TOGGLE_TOOL_BUTTON_H__
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index a1172f8dd0..3ce3b827d8 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -29,6 +29,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TOOLBAR_H__
#define __GTK_TOOLBAR_H__
diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h
index b7329a02f8..6b031d63b5 100644
--- a/gtk/gtktoolbutton.h
+++ b/gtk/gtktoolbutton.h
@@ -20,6 +20,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TOOL_BUTTON_H__
#define __GTK_TOOL_BUTTON_H__
diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h
index 430c16d40d..865d02d306 100644
--- a/gtk/gtktoolitem.h
+++ b/gtk/gtktoolitem.h
@@ -20,6 +20,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TOOL_ITEM_H__
#define __GTK_TOOL_ITEM_H__
diff --git a/gtk/gtktoolshell.h b/gtk/gtktoolshell.h
index 684ad897a3..87bb647ce2 100644
--- a/gtk/gtktoolshell.h
+++ b/gtk/gtktoolshell.h
@@ -20,6 +20,10 @@
* Mathias Hasselmann
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TOOL_SHELL_H__
#define __GTK_TOOL_SHELL_H__
diff --git a/gtk/gtktooltip.h b/gtk/gtktooltip.h
index d91cdbaf9f..6d21d3dbe2 100644
--- a/gtk/gtktooltip.h
+++ b/gtk/gtktooltip.h
@@ -19,6 +19,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TOOLTIP_H__
#define __GTK_TOOLTIP_H__
diff --git a/gtk/gtktreedatalist.h b/gtk/gtktreedatalist.h
index 49a0940f4d..bd1928d789 100644
--- a/gtk/gtktreedatalist.h
+++ b/gtk/gtktreedatalist.h
@@ -17,13 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
-
#ifndef __GTK_TREE_DATA_LIST_H__
#define __GTK_TREE_DATA_LIST_H__
-#include <glib.h>
-#include <glib-object.h>
-#include "gtktreesortable.h"
+#include <gtk/gtk.h>
typedef struct _GtkTreeDataList GtkTreeDataList;
struct _GtkTreeDataList
diff --git a/gtk/gtktreednd.h b/gtk/gtktreednd.h
index eb983b7aea..517ba50d2a 100644
--- a/gtk/gtktreednd.h
+++ b/gtk/gtktreednd.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TREE_DND_H__
#define __GTK_TREE_DND_H__
diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h
index cc5b937d99..74185abb67 100644
--- a/gtk/gtktreemodel.h
+++ b/gtk/gtktreemodel.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TREE_MODEL_H__
#define __GTK_TREE_MODEL_H__
diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h
index e9ab5829b2..43d3e06127 100644
--- a/gtk/gtktreemodelfilter.h
+++ b/gtk/gtktreemodelfilter.h
@@ -18,6 +18,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TREE_MODEL_FILTER_H__
#define __GTK_TREE_MODEL_FILTER_H__
diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index cc26189917..d053f86ea6 100644
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TREE_MODEL_SORT_H__
#define __GTK_TREE_MODEL_SORT_H__
diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index 2c3e0a2b82..6c68ba473b 100644
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TREE_SELECTION_H__
#define __GTK_TREE_SELECTION_H__
diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h
index dd7282a192..ca9311fa1b 100644
--- a/gtk/gtktreesortable.h
+++ b/gtk/gtktreesortable.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TREE_SORTABLE_H__
#define __GTK_TREE_SORTABLE_H__
diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index b7e61e2a15..7eb2711483 100644
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TREE_STORE_H__
#define __GTK_TREE_STORE_H__
diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index 9ea61a9ff0..d5ff9a68f8 100644
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -16,6 +16,11 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TREE_VIEW_H__
#define __GTK_TREE_VIEW_H__
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 89073858b2..2d45ce5836 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -17,6 +17,10 @@
* Boston, MA 02111-1307, USA.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TREE_VIEW_COLUMN_H__
#define __GTK_TREE_VIEW_COLUMN_H__
diff --git a/gtk/gtktypebuiltins.h.template b/gtk/gtktypebuiltins.h.template
index 8c45c84dbc..0e9d9a6c8b 100644
--- a/gtk/gtktypebuiltins.h.template
+++ b/gtk/gtktypebuiltins.h.template
@@ -1,4 +1,8 @@
/*** BEGIN file-header ***/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TYPE_BUILTINS_H__
#define __GTK_TYPE_BUILTINS_H__
diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index e0fd6ab933..67e6dfaa6e 100644
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_TYPE_UTILS_H__
#define __GTK_TYPE_UTILS_H__
diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h
index 7e1e6ead68..27fce6bcf3 100644
--- a/gtk/gtkuimanager.h
+++ b/gtk/gtkuimanager.h
@@ -27,6 +27,11 @@
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_UI_MANAGER_H__
#define __GTK_UI_MANAGER_H__
diff --git a/gtk/gtkvbbox.h b/gtk/gtkvbbox.h
index 8c21273c97..fd1c05b8f4 100644
--- a/gtk/gtkvbbox.h
+++ b/gtk/gtkvbbox.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_VBBOX_H__
#define __GTK_VBBOX_H__
diff --git a/gtk/gtkvbox.h b/gtk/gtkvbox.h
index 3cdb2ad15f..63a82310d9 100644
--- a/gtk/gtkvbox.h
+++ b/gtk/gtkvbox.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_VBOX_H__
#define __GTK_VBOX_H__
diff --git a/gtk/gtkversion.h.in b/gtk/gtkversion.h.in
index b0b20bd5a1..172c688763 100644
--- a/gtk/gtkversion.h.in
+++ b/gtk/gtkversion.h.in
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_VERSION_H__
#define __GTK_VERSION_H__
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index 8b64f1743c..d40fe6e4bb 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_VIEWPORT_H__
#define __GTK_VIEWPORT_H__
diff --git a/gtk/gtkvolumebutton.h b/gtk/gtkvolumebutton.h
index 069c1228a6..f28a7134c1 100644
--- a/gtk/gtkvolumebutton.h
+++ b/gtk/gtkvolumebutton.h
@@ -27,6 +27,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_VOLUME_BUTTON_H__
#define __GTK_VOLUME_BUTTON_H__
diff --git a/gtk/gtkvpaned.h b/gtk/gtkvpaned.h
index 10bb9a0c3f..187ad5c487 100644
--- a/gtk/gtkvpaned.h
+++ b/gtk/gtkvpaned.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_VPANED_H__
#define __GTK_VPANED_H__
diff --git a/gtk/gtkvruler.h b/gtk/gtkvruler.h
index 2b27e52fe4..35bf444172 100644
--- a/gtk/gtkvruler.h
+++ b/gtk/gtkvruler.h
@@ -34,6 +34,10 @@
* distribution.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_VRULER_H__
#define __GTK_VRULER_H__
diff --git a/gtk/gtkvscale.h b/gtk/gtkvscale.h
index 8661b7515e..8fb305deae 100644
--- a/gtk/gtkvscale.h
+++ b/gtk/gtkvscale.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_VSCALE_H__
#define __GTK_VSCALE_H__
diff --git a/gtk/gtkvscrollbar.h b/gtk/gtkvscrollbar.h
index bdd6c3d03f..808b3e6b40 100644
--- a/gtk/gtkvscrollbar.h
+++ b/gtk/gtkvscrollbar.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_VSCROLLBAR_H__
#define __GTK_VSCROLLBAR_H__
diff --git a/gtk/gtkvseparator.h b/gtk/gtkvseparator.h
index e7fd88b0e7..41095f1d62 100644
--- a/gtk/gtkvseparator.h
+++ b/gtk/gtkvseparator.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_VSEPARATOR_H__
#define __GTK_VSEPARATOR_H__
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 9358893cda..6d4b2a65ac 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_WIDGET_H__
#define __GTK_WIDGET_H__
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 2f84c497cb..d428da233f 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -24,6 +24,10 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
#ifndef __GTK_WINDOW_H__
#define __GTK_WINDOW_H__