summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorMichael Natterer <mitch@gimp.org>2009-10-21 20:30:04 +0200
committerJavier Jardón <jjardon@gnome.org>2010-05-03 01:51:18 +0200
commit5e29973773d4e2177f234675cc2a2b2016aa9fbc (patch)
tree6d94d97e37033f2d96f55b9267900a0da5535832 /gtk
parent90d514a8a566e3e534b913f943f80f1f92646173 (diff)
downloadgtk+-5e29973773d4e2177f234675cc2a2b2016aa9fbc.tar.gz
Remove all traces of GDK_PIXBUF/GTK_DISABLE_SINGLE_INCLUDES
...and disallow inclusion of individual files unconditionally.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkaboutdialog.h2
-rw-r--r--gtk/gtkaccelgroup.h2
-rw-r--r--gtk/gtkaccellabel.h2
-rw-r--r--gtk/gtkaccelmap.h2
-rw-r--r--gtk/gtkaccessible.h2
-rw-r--r--gtk/gtkaction.h2
-rw-r--r--gtk/gtkactiongroup.h2
-rw-r--r--gtk/gtkactivatable.h2
-rw-r--r--gtk/gtkadjustment.h2
-rw-r--r--gtk/gtkalignment.h2
-rw-r--r--gtk/gtkarrow.h2
-rw-r--r--gtk/gtkaspectframe.h2
-rw-r--r--gtk/gtkassistant.h2
-rw-r--r--gtk/gtkbbox.h2
-rw-r--r--gtk/gtkbin.h2
-rw-r--r--gtk/gtkbindings.h2
-rw-r--r--gtk/gtkbox.h2
-rw-r--r--gtk/gtkbuildable.h2
-rw-r--r--gtk/gtkbuilder.h2
-rw-r--r--gtk/gtkbutton.h2
-rw-r--r--gtk/gtkcalendar.h2
-rw-r--r--gtk/gtkcelleditable.h2
-rw-r--r--gtk/gtkcelllayout.h2
-rw-r--r--gtk/gtkcellrenderer.h2
-rw-r--r--gtk/gtkcellrendereraccel.h2
-rw-r--r--gtk/gtkcellrenderercombo.h2
-rw-r--r--gtk/gtkcellrendererpixbuf.h2
-rw-r--r--gtk/gtkcellrendererprogress.h2
-rw-r--r--gtk/gtkcellrendererspin.h2
-rw-r--r--gtk/gtkcellrenderertext.h2
-rw-r--r--gtk/gtkcellrenderertoggle.h2
-rw-r--r--gtk/gtkcellview.h2
-rw-r--r--gtk/gtkcheckbutton.h2
-rw-r--r--gtk/gtkcheckmenuitem.h2
-rw-r--r--gtk/gtkclipboard.h2
-rw-r--r--gtk/gtkcolorbutton.h2
-rw-r--r--gtk/gtkcolorsel.h2
-rw-r--r--gtk/gtkcolorseldialog.h2
-rw-r--r--gtk/gtkcombobox.h2
-rw-r--r--gtk/gtkcomboboxentry.h2
-rw-r--r--gtk/gtkcontainer.h2
-rw-r--r--gtk/gtkdebug.h2
-rw-r--r--gtk/gtkdialog.h2
-rw-r--r--gtk/gtkdnd.h2
-rw-r--r--gtk/gtkdrawingarea.h2
-rw-r--r--gtk/gtkeditable.h2
-rw-r--r--gtk/gtkentry.h2
-rw-r--r--gtk/gtkentrybuffer.h2
-rw-r--r--gtk/gtkentrycompletion.h2
-rw-r--r--gtk/gtkenums.h2
-rw-r--r--gtk/gtkeventbox.h2
-rw-r--r--gtk/gtkexpander.h2
-rw-r--r--gtk/gtkfilechooser.h2
-rw-r--r--gtk/gtkfilechooserbutton.h2
-rw-r--r--gtk/gtkfilechooserdialog.h2
-rw-r--r--gtk/gtkfilechooserwidget.h2
-rw-r--r--gtk/gtkfilefilter.h2
-rw-r--r--gtk/gtkfixed.h2
-rw-r--r--gtk/gtkfontbutton.h2
-rw-r--r--gtk/gtkfontsel.h2
-rw-r--r--gtk/gtkframe.h2
-rw-r--r--gtk/gtkgc.h2
-rw-r--r--gtk/gtkhandlebox.h2
-rw-r--r--gtk/gtkhbbox.h2
-rw-r--r--gtk/gtkhbox.h2
-rw-r--r--gtk/gtkhpaned.h2
-rw-r--r--gtk/gtkhruler.h2
-rw-r--r--gtk/gtkhscale.h2
-rw-r--r--gtk/gtkhscrollbar.h2
-rw-r--r--gtk/gtkhseparator.h2
-rw-r--r--gtk/gtkiconfactory.h2
-rw-r--r--gtk/gtkicontheme.h2
-rw-r--r--gtk/gtkiconview.h2
-rw-r--r--gtk/gtkimage.h2
-rw-r--r--gtk/gtkimagemenuitem.h2
-rw-r--r--gtk/gtkimcontext.h2
-rw-r--r--gtk/gtkimcontextsimple.h2
-rw-r--r--gtk/gtkimmulticontext.h2
-rw-r--r--gtk/gtkinvisible.h2
-rw-r--r--gtk/gtkitem.h2
-rw-r--r--gtk/gtklabel.h2
-rw-r--r--gtk/gtklayout.h2
-rw-r--r--gtk/gtklinkbutton.h2
-rw-r--r--gtk/gtkliststore.h2
-rw-r--r--gtk/gtkmain.h2
-rw-r--r--gtk/gtkmenu.h2
-rw-r--r--gtk/gtkmenubar.h2
-rw-r--r--gtk/gtkmenuitem.h2
-rw-r--r--gtk/gtkmenushell.h2
-rw-r--r--gtk/gtkmenutoolbutton.h2
-rw-r--r--gtk/gtkmessagedialog.h2
-rw-r--r--gtk/gtkmisc.h2
-rw-r--r--gtk/gtkmodules.h2
-rw-r--r--gtk/gtknotebook.h2
-rw-r--r--gtk/gtkobject.h2
-rw-r--r--gtk/gtkpagesetup.h2
-rw-r--r--gtk/gtkpagesetupunixdialog.h2
-rw-r--r--gtk/gtkpaned.h2
-rw-r--r--gtk/gtkpapersize.h2
-rw-r--r--gtk/gtkplug.h2
-rw-r--r--gtk/gtkprintcontext.h2
-rw-r--r--gtk/gtkprinter.h2
-rw-r--r--gtk/gtkprintjob.h2
-rw-r--r--gtk/gtkprintoperation.h2
-rw-r--r--gtk/gtkprintoperationpreview.h2
-rw-r--r--gtk/gtkprintsettings.h2
-rw-r--r--gtk/gtkprintunixdialog.h2
-rw-r--r--gtk/gtkprogressbar.h2
-rw-r--r--gtk/gtkradioaction.h2
-rw-r--r--gtk/gtkradiobutton.h2
-rw-r--r--gtk/gtkradiomenuitem.h2
-rw-r--r--gtk/gtkradiotoolbutton.h2
-rw-r--r--gtk/gtkrange.h2
-rw-r--r--gtk/gtkrc.h2
-rw-r--r--gtk/gtkrecentaction.h2
-rw-r--r--gtk/gtkrecentchooser.h2
-rw-r--r--gtk/gtkrecentchooserdialog.h2
-rw-r--r--gtk/gtkrecentchoosermenu.h2
-rw-r--r--gtk/gtkrecentchooserwidget.h2
-rw-r--r--gtk/gtkrecentfilter.h2
-rw-r--r--gtk/gtkrecentmanager.h2
-rw-r--r--gtk/gtkruler.h2
-rw-r--r--gtk/gtkscale.h2
-rw-r--r--gtk/gtkscalebutton.h2
-rw-r--r--gtk/gtkscrollbar.h2
-rw-r--r--gtk/gtkscrolledwindow.h2
-rw-r--r--gtk/gtkselection.h2
-rw-r--r--gtk/gtkseparator.h2
-rw-r--r--gtk/gtkseparatormenuitem.h2
-rw-r--r--gtk/gtkseparatortoolitem.h2
-rw-r--r--gtk/gtksettings.h2
-rw-r--r--gtk/gtksizegroup.h2
-rw-r--r--gtk/gtksocket.h2
-rw-r--r--gtk/gtkspinbutton.h2
-rw-r--r--gtk/gtkstatusbar.h2
-rw-r--r--gtk/gtkstatusicon.h2
-rw-r--r--gtk/gtkstock.h2
-rw-r--r--gtk/gtkstyle.h2
-rw-r--r--gtk/gtktable.h2
-rw-r--r--gtk/gtktearoffmenuitem.h2
-rw-r--r--gtk/gtktextbuffer.h2
-rw-r--r--gtk/gtktextbufferrichtext.h2
-rw-r--r--gtk/gtktextchild.h2
-rw-r--r--gtk/gtktextiter.h2
-rw-r--r--gtk/gtktextmark.h2
-rw-r--r--gtk/gtktexttag.h2
-rw-r--r--gtk/gtktexttagtable.h2
-rw-r--r--gtk/gtktextview.h2
-rw-r--r--gtk/gtktoggleaction.h2
-rw-r--r--gtk/gtktogglebutton.h2
-rw-r--r--gtk/gtktoggletoolbutton.h2
-rw-r--r--gtk/gtktoolbar.h2
-rw-r--r--gtk/gtktoolbutton.h2
-rw-r--r--gtk/gtktoolitem.h2
-rw-r--r--gtk/gtktooltip.h2
-rw-r--r--gtk/gtktreednd.h2
-rw-r--r--gtk/gtktreemodel.h2
-rw-r--r--gtk/gtktreemodelfilter.h2
-rw-r--r--gtk/gtktreemodelsort.h2
-rw-r--r--gtk/gtktreeselection.h2
-rw-r--r--gtk/gtktreesortable.h2
-rw-r--r--gtk/gtktreestore.h2
-rw-r--r--gtk/gtktreeview.h2
-rw-r--r--gtk/gtktreeviewcolumn.h2
-rw-r--r--gtk/gtktypeutils.h2
-rw-r--r--gtk/gtkuimanager.h2
-rw-r--r--gtk/gtkvbbox.h2
-rw-r--r--gtk/gtkvbox.h2
-rw-r--r--gtk/gtkviewport.h2
-rw-r--r--gtk/gtkvolumebutton.h2
-rw-r--r--gtk/gtkvpaned.h2
-rw-r--r--gtk/gtkvruler.h2
-rw-r--r--gtk/gtkvscale.h2
-rw-r--r--gtk/gtkvscrollbar.h2
-rw-r--r--gtk/gtkvseparator.h2
-rw-r--r--gtk/gtkwidget.h2
-rw-r--r--gtk/gtkwindow.h2
177 files changed, 177 insertions, 177 deletions
diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h
index 0e597f4920..59120c1199 100644
--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@@ -22,7 +22,7 @@
Author: Anders Carlsson <andersca@codefactory.se>
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index bef6d97e18..1effbdaaf8 100644
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h
index 1813c2c049..97a839dcfa 100644
--- a/gtk/gtkaccellabel.h
+++ b/gtk/gtkaccellabel.h
@@ -27,7 +27,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkaccelmap.h b/gtk/gtkaccelmap.h
index 208704920b..0a3937ac1b 100644
--- a/gtk/gtkaccelmap.h
+++ b/gtk/gtkaccelmap.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h
index a9d21bcdd6..e7703c5abe 100644
--- a/gtk/gtkaccessible.h
+++ b/gtk/gtkaccessible.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h
index 92ba1fed2b..999c38f6e8 100644
--- a/gtk/gtkaction.h
+++ b/gtk/gtkaction.h
@@ -28,7 +28,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 1d8b388b1f..30d7542741 100644
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -28,7 +28,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkactivatable.h b/gtk/gtkactivatable.h
index 45d1decd46..705bfa4e80 100644
--- a/gtk/gtkactivatable.h
+++ b/gtk/gtkactivatable.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index f5ead22509..39a6f86293 100644
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h
index 4fad3027e3..9a37191d93 100644
--- a/gtk/gtkalignment.h
+++ b/gtk/gtkalignment.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h
index 010e3ef227..3140d588e6 100644
--- a/gtk/gtkarrow.h
+++ b/gtk/gtkarrow.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
index d78ee87e3c..bb98f62ba4 100644
--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h
index 5f26325bfa..47fd16ba86 100644
--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@@ -23,7 +23,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h
index 26ec7565fc..76ac7ba702 100644
--- a/gtk/gtkbbox.h
+++ b/gtk/gtkbbox.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h
index b80e111833..7db2a5ae4a 100644
--- a/gtk/gtkbin.h
+++ b/gtk/gtkbin.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
index 2d1cca9a7c..904eb3e8c1 100644
--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@@ -27,7 +27,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 03075db341..ee6595699c 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index ebd7ac2c41..50ed14cd1d 100644
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h
index 8a2a8290a3..bb711e27ab 100644
--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index 7a67ddcf91..4ed4d301fc 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h
index 57e890b7c4..a18745bd0d 100644
--- a/gtk/gtkcalendar.h
+++ b/gtk/gtkcalendar.h
@@ -26,7 +26,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcelleditable.h b/gtk/gtkcelleditable.h
index 74d6949ae0..603e120ada 100644
--- a/gtk/gtkcelleditable.h
+++ b/gtk/gtkcelleditable.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcelllayout.h b/gtk/gtkcelllayout.h
index b3d8d06090..04e4745ee9 100644
--- a/gtk/gtkcelllayout.h
+++ b/gtk/gtkcelllayout.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index e74be262a2..d16f3d4160 100644
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcellrendereraccel.h b/gtk/gtkcellrendereraccel.h
index 7ca2c60a7e..562f7f3634 100644
--- a/gtk/gtkcellrendereraccel.h
+++ b/gtk/gtkcellrendereraccel.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcellrenderercombo.h b/gtk/gtkcellrenderercombo.h
index 379c6e649e..49b63206e1 100644
--- a/gtk/gtkcellrenderercombo.h
+++ b/gtk/gtkcellrenderercombo.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcellrendererpixbuf.h b/gtk/gtkcellrendererpixbuf.h
index 33b92d03e9..8043c2d63e 100644
--- a/gtk/gtkcellrendererpixbuf.h
+++ b/gtk/gtkcellrendererpixbuf.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcellrendererprogress.h b/gtk/gtkcellrendererprogress.h
index fa5569f95a..1a1eec6421 100644
--- a/gtk/gtkcellrendererprogress.h
+++ b/gtk/gtkcellrendererprogress.h
@@ -25,7 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcellrendererspin.h b/gtk/gtkcellrendererspin.h
index b9f0bb1a6a..5daccdac2c 100644
--- a/gtk/gtkcellrendererspin.h
+++ b/gtk/gtkcellrendererspin.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h
index fb96219e54..5397927e1a 100644
--- a/gtk/gtkcellrenderertext.h
+++ b/gtk/gtkcellrenderertext.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h
index cf6a3c2f3d..59a2ec571b 100644
--- a/gtk/gtkcellrenderertoggle.h
+++ b/gtk/gtkcellrenderertoggle.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h
index 3ca51e9c40..06305f9a29 100644
--- a/gtk/gtkcellview.h
+++ b/gtk/gtkcellview.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h
index 54c6dcfa39..90e65c2ec8 100644
--- a/gtk/gtkcheckbutton.h
+++ b/gtk/gtkcheckbutton.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h
index 2361c05d38..bf5230cf89 100644
--- a/gtk/gtkcheckmenuitem.h
+++ b/gtk/gtkcheckmenuitem.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h
index 742c9b359b..f0e5514a09 100644
--- a/gtk/gtkclipboard.h
+++ b/gtk/gtkclipboard.h
@@ -19,7 +19,7 @@
* Global clipboard abstraction.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h
index 21c1460a40..257eb28a42 100644
--- a/gtk/gtkcolorbutton.h
+++ b/gtk/gtkcolorbutton.h
@@ -29,7 +29,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h
index 611a7553ce..b99d1266ce 100644
--- a/gtk/gtkcolorsel.h
+++ b/gtk/gtkcolorsel.h
@@ -25,7 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcolorseldialog.h b/gtk/gtkcolorseldialog.h
index 395883693a..dcde2736d8 100644
--- a/gtk/gtkcolorseldialog.h
+++ b/gtk/gtkcolorseldialog.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index 963e4b415b..cbe40f9ca5 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcomboboxentry.h b/gtk/gtkcomboboxentry.h
index 81c5aec1f5..c8820c56b5 100644
--- a/gtk/gtkcomboboxentry.h
+++ b/gtk/gtkcomboboxentry.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 0bf30b9a2f..1357b7c1b0 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h
index 3798bc4ad9..4e656a2ef1 100644
--- a/gtk/gtkdebug.h
+++ b/gtk/gtkdebug.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index 18a18961c8..b1a89f0072 100644
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h
index 72ab05919f..e26b2fa85d 100644
--- a/gtk/gtkdnd.h
+++ b/gtk/gtkdnd.h
@@ -25,7 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h
index 7208d7ab59..07283bbfb6 100644
--- a/gtk/gtkdrawingarea.h
+++ b/gtk/gtkdrawingarea.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h
index 914d41cb2b..fbbc847111 100644
--- a/gtk/gtkeditable.h
+++ b/gtk/gtkeditable.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index 6200e50a25..19d489c906 100644
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -28,7 +28,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkentrybuffer.h b/gtk/gtkentrybuffer.h
index 20556cb9e8..51725b9720 100644
--- a/gtk/gtkentrybuffer.h
+++ b/gtk/gtkentrybuffer.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h
index f0f05aa430..016b25e764 100644
--- a/gtk/gtkentrycompletion.h
+++ b/gtk/gtkentrycompletion.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index 7c577c70b7..5412fa62c9 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkeventbox.h b/gtk/gtkeventbox.h
index c8e9d9cd56..079ff48e30 100644
--- a/gtk/gtkeventbox.h
+++ b/gtk/gtkeventbox.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h
index dc07a6ce71..11f91750d2 100644
--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@@ -21,7 +21,7 @@
* Mark McLoughlin <mark@skynet.ie>
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkfilechooser.h b/gtk/gtkfilechooser.h
index 21ba7ee5f7..bcc8734d8a 100644
--- a/gtk/gtkfilechooser.h
+++ b/gtk/gtkfilechooser.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h
index 76de49a5a4..f6a5bd58c5 100644
--- a/gtk/gtkfilechooserbutton.h
+++ b/gtk/gtkfilechooserbutton.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkfilechooserdialog.h b/gtk/gtkfilechooserdialog.h
index 12b90e0c72..10ee0639c9 100644
--- a/gtk/gtkfilechooserdialog.h
+++ b/gtk/gtkfilechooserdialog.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkfilechooserwidget.h b/gtk/gtkfilechooserwidget.h
index 3b970f3094..fbc04c9d6e 100644
--- a/gtk/gtkfilechooserwidget.h
+++ b/gtk/gtkfilechooserwidget.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkfilefilter.h b/gtk/gtkfilefilter.h
index dde1fa931a..7a848e51a5 100644
--- a/gtk/gtkfilefilter.h
+++ b/gtk/gtkfilefilter.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h
index 6480a2d188..b69fb33395 100644
--- a/gtk/gtkfixed.h
+++ b/gtk/gtkfixed.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkfontbutton.h b/gtk/gtkfontbutton.h
index 134097096c..813e639ef7 100644
--- a/gtk/gtkfontbutton.h
+++ b/gtk/gtkfontbutton.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h
index a8936517aa..5b1b2ceb63 100644
--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@@ -28,7 +28,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 2b1e926cde..393f355c72 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkgc.h b/gtk/gtkgc.h
index 5fcb1a2cf0..8395bbafbf 100644
--- a/gtk/gtkgc.h
+++ b/gtk/gtkgc.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h
index 47fb39053d..b914e962d7 100644
--- a/gtk/gtkhandlebox.h
+++ b/gtk/gtkhandlebox.h
@@ -29,7 +29,7 @@
* their parents.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkhbbox.h b/gtk/gtkhbbox.h
index 89259c939d..f0aec6e8dd 100644
--- a/gtk/gtkhbbox.h
+++ b/gtk/gtkhbbox.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkhbox.h b/gtk/gtkhbox.h
index 02b74acbe9..e04c7314cf 100644
--- a/gtk/gtkhbox.h
+++ b/gtk/gtkhbox.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkhpaned.h b/gtk/gtkhpaned.h
index 560ea2e3e6..3a526b5cb1 100644
--- a/gtk/gtkhpaned.h
+++ b/gtk/gtkhpaned.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkhruler.h b/gtk/gtkhruler.h
index 3c30917cef..d2c876e3f4 100644
--- a/gtk/gtkhruler.h
+++ b/gtk/gtkhruler.h
@@ -34,7 +34,7 @@
* distribution.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkhscale.h b/gtk/gtkhscale.h
index 6b13a09c4c..9ecfd699fb 100644
--- a/gtk/gtkhscale.h
+++ b/gtk/gtkhscale.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkhscrollbar.h b/gtk/gtkhscrollbar.h
index f3300a7ccb..2246c74dc5 100644
--- a/gtk/gtkhscrollbar.h
+++ b/gtk/gtkhscrollbar.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkhseparator.h b/gtk/gtkhseparator.h
index a4d9f11725..4cda938477 100644
--- a/gtk/gtkhseparator.h
+++ b/gtk/gtkhseparator.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h
index 574b101d08..d7a1bf8787 100644
--- a/gtk/gtkiconfactory.h
+++ b/gtk/gtkiconfactory.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index f8609cbc0b..aa1fa51685 100644
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkiconview.h b/gtk/gtkiconview.h
index 7b9e51d227..10e17897d8 100644
--- a/gtk/gtkiconview.h
+++ b/gtk/gtkiconview.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h
index 2170ff7358..13da499888 100644
--- a/gtk/gtkimage.h
+++ b/gtk/gtkimage.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h
index b82bdfd319..7d50ea44b6 100644
--- a/gtk/gtkimagemenuitem.h
+++ b/gtk/gtkimagemenuitem.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h
index a0f26471a5..21452f2cce 100644
--- a/gtk/gtkimcontext.h
+++ b/gtk/gtkimcontext.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h
index 2c44db25a3..8017c314f8 100644
--- a/gtk/gtkimcontextsimple.h
+++ b/gtk/gtkimcontextsimple.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h
index 951ddae266..418a9327f7 100644
--- a/gtk/gtkimmulticontext.h
+++ b/gtk/gtkimmulticontext.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h
index 5625f99458..2f38905525 100644
--- a/gtk/gtkinvisible.h
+++ b/gtk/gtkinvisible.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkitem.h b/gtk/gtkitem.h
index 4c3d3aee63..0475805610 100644
--- a/gtk/gtkitem.h
+++ b/gtk/gtkitem.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index c1c5b682f4..9c8cffacfd 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -23,7 +23,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h
index aa542ca72a..b446fb331f 100644
--- a/gtk/gtklayout.h
+++ b/gtk/gtklayout.h
@@ -28,7 +28,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h
index 4e834dae94..a5e987e27c 100644
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -22,7 +22,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Cambridge, MA 02139, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h
index 6de426e89c..51cbfb3278 100644
--- a/gtk/gtkliststore.h
+++ b/gtk/gtkliststore.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index 21de92ed42..680ae2844e 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index 694457a059..8a59ae0274 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h
index 7e93234c73..050fb4846b 100644
--- a/gtk/gtkmenubar.h
+++ b/gtk/gtkmenubar.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 7e60087473..6334785f1b 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h
index 614d3975f2..e0d042bf17 100644
--- a/gtk/gtkmenushell.h
+++ b/gtk/gtkmenushell.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkmenutoolbutton.h b/gtk/gtkmenutoolbutton.h
index 9d6e240c8c..916e6acf7b 100644
--- a/gtk/gtkmenutoolbutton.h
+++ b/gtk/gtkmenutoolbutton.h
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h
index c46c7b3db7..c4ef610693 100644
--- a/gtk/gtkmessagedialog.h
+++ b/gtk/gtkmessagedialog.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h
index 477c73b605..0cb14163de 100644
--- a/gtk/gtkmisc.h
+++ b/gtk/gtkmisc.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkmodules.h b/gtk/gtkmodules.h
index 84bc86ca63..ca1c52e431 100644
--- a/gtk/gtkmodules.h
+++ b/gtk/gtkmodules.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index ab370b4ad4..e58bc5d2d2 100644
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -25,7 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h
index a32ecd0bf0..d64b5b1ef7 100644
--- a/gtk/gtkobject.h
+++ b/gtk/gtkobject.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h
index d5eaea6d5d..b310e5c93a 100644
--- a/gtk/gtkpagesetup.h
+++ b/gtk/gtkpagesetup.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkpagesetupunixdialog.h b/gtk/gtkpagesetupunixdialog.h
index f64d004d9b..58d7b611f8 100644
--- a/gtk/gtkpagesetupunixdialog.h
+++ b/gtk/gtkpagesetupunixdialog.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtkunixprint.h> can be included directly."
#endif
diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h
index 7721f947c2..5067e42d18 100644
--- a/gtk/gtkpaned.h
+++ b/gtk/gtkpaned.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h
index 18302cae77..a3ef2f1067 100644
--- a/gtk/gtkpapersize.h
+++ b/gtk/gtkpapersize.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h
index 3ea9971960..c96ca774fa 100644
--- a/gtk/gtkplug.h
+++ b/gtk/gtkplug.h
@@ -23,7 +23,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkprintcontext.h b/gtk/gtkprintcontext.h
index 30572d6835..b38fd15ac4 100644
--- a/gtk/gtkprintcontext.h
+++ b/gtk/gtkprintcontext.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h
index 527582c95d..e2cb534963 100644
--- a/gtk/gtkprinter.h
+++ b/gtk/gtkprinter.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtkunixprint.h> can be included directly."
#endif
diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h
index fd821840f9..9d2c25b548 100644
--- a/gtk/gtkprintjob.h
+++ b/gtk/gtkprintjob.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtkunixprint.h> can be included directly."
#endif
diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index ef9a2879f3..fed196a3e7 100644
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkprintoperationpreview.h b/gtk/gtkprintoperationpreview.h
index a36b4afb71..850b0806e0 100644
--- a/gtk/gtkprintoperationpreview.h
+++ b/gtk/gtkprintoperationpreview.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h
index 267854c351..102c6c497a 100644
--- a/gtk/gtkprintsettings.h
+++ b/gtk/gtkprintsettings.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkprintunixdialog.h b/gtk/gtkprintunixdialog.h
index 4ff22e4ed8..f0bb798012 100644
--- a/gtk/gtkprintunixdialog.h
+++ b/gtk/gtkprintunixdialog.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtkunixprint.h> can be included directly."
#endif
diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h
index acbaa6d29b..cefe6f12f7 100644
--- a/gtk/gtkprogressbar.h
+++ b/gtk/gtkprogressbar.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkradioaction.h b/gtk/gtkradioaction.h
index 2b7d72361c..d4a971254c 100644
--- a/gtk/gtkradioaction.h
+++ b/gtk/gtkradioaction.h
@@ -28,7 +28,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h
index 520c10d1a3..fb075131f6 100644
--- a/gtk/gtkradiobutton.h
+++ b/gtk/gtkradiobutton.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkradiomenuitem.h b/gtk/gtkradiomenuitem.h
index 0cec6b06f8..7382bfb7e7 100644
--- a/gtk/gtkradiomenuitem.h
+++ b/gtk/gtkradiomenuitem.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkradiotoolbutton.h b/gtk/gtkradiotoolbutton.h
index 768c7630b6..7f77efd429 100644
--- a/gtk/gtkradiotoolbutton.h
+++ b/gtk/gtkradiotoolbutton.h
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h
index abfbc7c137..abbd105fb1 100644
--- a/gtk/gtkrange.h
+++ b/gtk/gtkrange.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h
index 03e2e579a0..fb923c2f6b 100644
--- a/gtk/gtkrc.h
+++ b/gtk/gtkrc.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkrecentaction.h b/gtk/gtkrecentaction.h
index 96d5ca6a19..777a8baf7b 100644
--- a/gtk/gtkrecentaction.h
+++ b/gtk/gtkrecentaction.h
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkrecentchooser.h b/gtk/gtkrecentchooser.h
index b32a1f47ae..8b891e1d51 100644
--- a/gtk/gtkrecentchooser.h
+++ b/gtk/gtkrecentchooser.h
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkrecentchooserdialog.h b/gtk/gtkrecentchooserdialog.h
index d8c12214a8..cfcce51362 100644
--- a/gtk/gtkrecentchooserdialog.h
+++ b/gtk/gtkrecentchooserdialog.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkrecentchoosermenu.h b/gtk/gtkrecentchoosermenu.h
index 6b401d6918..c30547a786 100644
--- a/gtk/gtkrecentchoosermenu.h
+++ b/gtk/gtkrecentchoosermenu.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkrecentchooserwidget.h b/gtk/gtkrecentchooserwidget.h
index d5aa58f51f..0a01428471 100644
--- a/gtk/gtkrecentchooserwidget.h
+++ b/gtk/gtkrecentchooserwidget.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkrecentfilter.h b/gtk/gtkrecentfilter.h
index 3be8e5e979..8dc64a85f9 100644
--- a/gtk/gtkrecentfilter.h
+++ b/gtk/gtkrecentfilter.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h
index 9bce7dc86d..d13fcf4148 100644
--- a/gtk/gtkrecentmanager.h
+++ b/gtk/gtkrecentmanager.h
@@ -18,7 +18,7 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkruler.h b/gtk/gtkruler.h
index ed149e3af6..2702125809 100644
--- a/gtk/gtkruler.h
+++ b/gtk/gtkruler.h
@@ -34,7 +34,7 @@
* distribution.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h
index 4221dd281c..204aa79891 100644
--- a/gtk/gtkscale.h
+++ b/gtk/gtkscale.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h
index 17dcaaee12..fc6cc583c9 100644
--- a/gtk/gtkscalebutton.h
+++ b/gtk/gtkscalebutton.h
@@ -33,7 +33,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h
index 524335da14..eab137e68c 100644
--- a/gtk/gtkscrollbar.h
+++ b/gtk/gtkscrollbar.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index a82b3b0967..c5d50663f7 100644
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index fd27680703..ae689d552e 100644
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h
index e0f6467358..b2ae0fba0c 100644
--- a/gtk/gtkseparator.h
+++ b/gtk/gtkseparator.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkseparatormenuitem.h b/gtk/gtkseparatormenuitem.h
index 8b9bb5920f..146174bd3d 100644
--- a/gtk/gtkseparatormenuitem.h
+++ b/gtk/gtkseparatormenuitem.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkseparatortoolitem.h b/gtk/gtkseparatortoolitem.h
index f015f65443..1547742c23 100644
--- a/gtk/gtkseparatortoolitem.h
+++ b/gtk/gtkseparatortoolitem.h
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h
index 4be0772c63..36fb9a5db9 100644
--- a/gtk/gtksettings.h
+++ b/gtk/gtksettings.h
@@ -16,7 +16,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h
index 28a06e9567..a41f8958ae 100644
--- a/gtk/gtksizegroup.h
+++ b/gtk/gtksizegroup.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h
index e47533de00..e3cd3a36ce 100644
--- a/gtk/gtksocket.h
+++ b/gtk/gtksocket.h
@@ -23,7 +23,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index f757af1d54..4f43a4a2a1 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -27,7 +27,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h
index ff0597655c..77558df23a 100644
--- a/gtk/gtkstatusbar.h
+++ b/gtk/gtkstatusbar.h
@@ -25,7 +25,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h
index 6bfafef3da..9142367b12 100644
--- a/gtk/gtkstatusicon.h
+++ b/gtk/gtkstatusicon.h
@@ -21,7 +21,7 @@
* Mark McLoughlin <mark@skynet.ie>
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h
index 84c22a4db9..0d3d2c02d7 100644
--- a/gtk/gtkstock.h
+++ b/gtk/gtkstock.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 77ff95a3f4..141cbcc379 100644
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktable.h b/gtk/gtktable.h
index 9b3ebf9dd3..f993d7e8f1 100644
--- a/gtk/gtktable.h
+++ b/gtk/gtktable.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktearoffmenuitem.h b/gtk/gtktearoffmenuitem.h
index a30b0ec462..3fa32a613c 100644
--- a/gtk/gtktearoffmenuitem.h
+++ b/gtk/gtktearoffmenuitem.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index d160c49065..3a773e50ea 100644
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktextbufferrichtext.h b/gtk/gtktextbufferrichtext.h
index bbbf6e2b0d..614b43dcfd 100644
--- a/gtk/gtktextbufferrichtext.h
+++ b/gtk/gtktextbufferrichtext.h
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktextchild.h b/gtk/gtktextchild.h
index 20cee010bc..7835e68f91 100644
--- a/gtk/gtktextchild.h
+++ b/gtk/gtktextchild.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index 44ba8721e7..046d436802 100644
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h
index 87118df7ec..5bddf92739 100644
--- a/gtk/gtktextmark.h
+++ b/gtk/gtktextmark.h
@@ -47,7 +47,7 @@
*
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index 406cc393c7..39c9f73d92 100644
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -47,7 +47,7 @@
*
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h
index ecc172d1c9..f33ae8f797 100644
--- a/gtk/gtktexttagtable.h
+++ b/gtk/gtktexttagtable.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h
index 5fe62bac9a..e7d4f463cf 100644
--- a/gtk/gtktextview.h
+++ b/gtk/gtktextview.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktoggleaction.h b/gtk/gtktoggleaction.h
index 5f72546326..2cdf3fd184 100644
--- a/gtk/gtktoggleaction.h
+++ b/gtk/gtktoggleaction.h
@@ -28,7 +28,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h
index 686dab8614..451d82cedd 100644
--- a/gtk/gtktogglebutton.h
+++ b/gtk/gtktogglebutton.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktoggletoolbutton.h b/gtk/gtktoggletoolbutton.h
index bc04d1e45e..90314327c9 100644
--- a/gtk/gtktoggletoolbutton.h
+++ b/gtk/gtktoggletoolbutton.h
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 42cd532ab5..fccfe4e8ed 100644
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -29,7 +29,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h
index cacabe1700..e9ba386a16 100644
--- a/gtk/gtktoolbutton.h
+++ b/gtk/gtktoolbutton.h
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h
index 882530ad98..5c05f3096d 100644
--- a/gtk/gtktoolitem.h
+++ b/gtk/gtktoolitem.h
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktooltip.h b/gtk/gtktooltip.h
index cc16cb0454..ac310c908d 100644
--- a/gtk/gtktooltip.h
+++ b/gtk/gtktooltip.h
@@ -19,7 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktreednd.h b/gtk/gtktreednd.h
index 517ba50d2a..e0de421f90 100644
--- a/gtk/gtktreednd.h
+++ b/gtk/gtktreednd.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h
index f103e9d924..c0df3083f7 100644
--- a/gtk/gtktreemodel.h
+++ b/gtk/gtktreemodel.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h
index 79e30fd31c..f77fa69d7a 100644
--- a/gtk/gtktreemodelfilter.h
+++ b/gtk/gtktreemodelfilter.h
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h
index 4823398579..e144b32c78 100644
--- a/gtk/gtktreemodelsort.h
+++ b/gtk/gtktreemodelsort.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index ece7ab8e6c..267a2af37e 100644
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h
index a576e2dff0..52dea7199d 100644
--- a/gtk/gtktreesortable.h
+++ b/gtk/gtktreesortable.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h
index b47b1ecb33..aee9baca97 100644
--- a/gtk/gtktreestore.h
+++ b/gtk/gtktreestore.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index f295958c7f..71734c941e 100644
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index e1627e5674..4e72235bc8 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index 48b664c2a7..a8bc41b749 100644
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h
index e58c2912db..faaf9ef787 100644
--- a/gtk/gtkuimanager.h
+++ b/gtk/gtkuimanager.h
@@ -28,7 +28,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkvbbox.h b/gtk/gtkvbbox.h
index 61bc4a11ac..c21be52303 100644
--- a/gtk/gtkvbbox.h
+++ b/gtk/gtkvbbox.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkvbox.h b/gtk/gtkvbox.h
index 68b549a743..5cd7bb9551 100644
--- a/gtk/gtkvbox.h
+++ b/gtk/gtkvbox.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index da6b97c8d5..15427e8801 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkvolumebutton.h b/gtk/gtkvolumebutton.h
index 1fd9bd9074..d5afa8fa04 100644
--- a/gtk/gtkvolumebutton.h
+++ b/gtk/gtkvolumebutton.h
@@ -27,7 +27,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkvpaned.h b/gtk/gtkvpaned.h
index 49a1aec48b..a42efa3edc 100644
--- a/gtk/gtkvpaned.h
+++ b/gtk/gtkvpaned.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkvruler.h b/gtk/gtkvruler.h
index 4cade7ba66..b9c7829220 100644
--- a/gtk/gtkvruler.h
+++ b/gtk/gtkvruler.h
@@ -34,7 +34,7 @@
* distribution.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkvscale.h b/gtk/gtkvscale.h
index cf67920596..ce4953e5ec 100644
--- a/gtk/gtkvscale.h
+++ b/gtk/gtkvscale.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkvscrollbar.h b/gtk/gtkvscrollbar.h
index 2cd2ec971c..ca2179075b 100644
--- a/gtk/gtkvscrollbar.h
+++ b/gtk/gtkvscrollbar.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkvseparator.h b/gtk/gtkvseparator.h
index a82ebfe10a..62c7bf50e1 100644
--- a/gtk/gtkvseparator.h
+++ b/gtk/gtkvseparator.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index d1c372d719..5bd7fd9c11 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index f1d1767dc1..f706e48e78 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -24,7 +24,7 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif