Make single includes mandatory

This has been the official line since 2.17, which seems plenty
long enough for a transition phase.

63 files changed, 65 insertions, 68 deletions

diff --git a/README.in b/README.in
index 9c9a9665c..beeefed25 100644
--- a/README.in
+++ b/README.in
@@ -36,6 +36,9 @@ Notes about GLib 2.32
   object is being used will not work with generic pointers (ie: (void*)
   and (gpointer) casts) which would have worked with the old version.
 
+* It is now mandatory to include glib.h instead of individual headers.
+
+
 Notes about GLib 2.30
 =====================
 
diff --git a/configure.ac b/configure.ac
index e4235e005..4a9e7234a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -512,8 +512,6 @@ if test "x$GCC" = "xyes"; then
   esac
 fi
 
-CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES"
-
 if test "$glib_native_win32" = "yes"; then
   if test x$enable_static = xyes -a x$enable_shared = xyes; then
     AC_MSG_ERROR([Can not build both shared and static at the same time on Windows.])
diff --git a/docs/reference/glib/compiling.sgml b/docs/reference/glib/compiling.sgml
index a47365391..9d20a582a 100644
--- a/docs/reference/glib/compiling.sgml
+++ b/docs/reference/glib/compiling.sgml
@@ -104,12 +104,8 @@ the <link linkend="glib-I18N">Internationalization section</link>),
 </para>
 
 <para>
-Starting with 2.17, GLib enforces this by generating an error
-when individual headers are directly included. To help with the
-transition, the enforcement is not turned on by default for GLib
-headers (it <emphasis>is</emphasis> turned on for GObject and GIO).
-To turn it on, define the preprocessor symbol G_DISABLE_SINGLE_INCLUDES
-by using the command line option <literal>-DG_DISABLE_SINGLE_INCLUDES</literal>.
+Starting with 2.32, GLib enforces this by generating an error
+when individual headers are directly included.
 </para>
 
 </refsect1>
diff --git a/glib/galloca.h b/glib/galloca.h
index 8876836a6..1ecdf65c0 100644
--- a/glib/galloca.h
+++ b/glib/galloca.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/garray.h b/glib/garray.h
index 822180641..3152b9791 100644
--- a/glib/garray.h
+++ b/glib/garray.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gasyncqueue.h b/glib/gasyncqueue.h
index 90d18545f..5c362d21b 100644
--- a/glib/gasyncqueue.h
+++ b/glib/gasyncqueue.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gatomic.h b/glib/gatomic.h
index 8b43bf098..0e4523fe7 100644
--- a/glib/gatomic.h
+++ b/glib/gatomic.h
@@ -19,7 +19,7 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gbacktrace.h b/glib/gbacktrace.h
index 0ee3efd2f..f59943275 100644
--- a/glib/gbacktrace.h
+++ b/glib/gbacktrace.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gbase64.h b/glib/gbase64.h
index 930389a67..88ce6d8ad 100644
--- a/glib/gbase64.h
+++ b/glib/gbase64.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gbitlock.h b/glib/gbitlock.h
index ea9cb41ac..641ee6966 100644
--- a/glib/gbitlock.h
+++ b/glib/gbitlock.h
@@ -25,7 +25,7 @@
 
 #include <glib/gtypes.h>
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gbookmarkfile.h b/glib/gbookmarkfile.h
index f663ebf27..6b2ee6f45 100644
--- a/glib/gbookmarkfile.h
+++ b/glib/gbookmarkfile.h
@@ -17,7 +17,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gcache.h b/glib/gcache.h
index a7c8ffabc..ab1a33303 100644
--- a/glib/gcache.h
+++ b/glib/gcache.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gchecksum.h b/glib/gchecksum.h
index 59bb31cd2..69fe1f414 100644
--- a/glib/gchecksum.h
+++ b/glib/gchecksum.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gconvert.h b/glib/gconvert.h
index 2d1bc1ffc..7fd16c849 100644
--- a/glib/gconvert.h
+++ b/glib/gconvert.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gdataset.h b/glib/gdataset.h
index 4451c38b4..eab296beb 100644
--- a/glib/gdataset.h
+++ b/glib/gdataset.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gdate.h b/glib/gdate.h
index 5b9219105..5ef1850b9 100644
--- a/glib/gdate.h
+++ b/glib/gdate.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gdatetime.h b/glib/gdatetime.h
index b76df89c7..6643e3ff2 100644
--- a/glib/gdatetime.h
+++ b/glib/gdatetime.h
@@ -23,7 +23,7 @@
  *          Ryan Lortie <desrt@desrt.ca>
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gdir.h b/glib/gdir.h
index 516fbb673..79b3038dd 100644
--- a/glib/gdir.h
+++ b/glib/gdir.h
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gerror.h b/glib/gerror.h
index 871f3101a..6eb65fee9 100644
--- a/glib/gerror.h
+++ b/glib/gerror.h
@@ -18,7 +18,7 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gfileutils.h b/glib/gfileutils.h
index a3ff242f9..177317788 100644
--- a/glib/gfileutils.h
+++ b/glib/gfileutils.h
@@ -18,7 +18,7 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/ghash.h b/glib/ghash.h
index c87c478c0..2e3184a9d 100644
--- a/glib/ghash.h
+++ b/glib/ghash.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/ghmac.h b/glib/ghmac.h
index 856abbf08..e9b57de1d 100644
--- a/glib/ghmac.h
+++ b/glib/ghmac.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/ghook.h b/glib/ghook.h
index 5577fc3e2..e7292ead7 100644
--- a/glib/ghook.h
+++ b/glib/ghook.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/giochannel.h b/glib/giochannel.h
index ed9e51c0a..1278714d1 100644
--- a/glib/giochannel.h
+++ b/glib/giochannel.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gkeyfile.h b/glib/gkeyfile.h
index e16dc6127..6b387086e 100644
--- a/glib/gkeyfile.h
+++ b/glib/gkeyfile.h
@@ -20,7 +20,7 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/glist.h b/glib/glist.h
index 52eee10a3..aaa11f2d9 100644
--- a/glib/glist.h
+++ b/glib/glist.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gmacros.h b/glib/gmacros.h
index ca14e727d..2b340cb0d 100644
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -28,7 +28,7 @@
  * not refer to variables from glibconfig.h
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gmain.h b/glib/gmain.h
index 13429a852..87ca4d698 100644
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gmappedfile.h b/glib/gmappedfile.h
index b7ca9d554..f697d8acb 100644
--- a/glib/gmappedfile.h
+++ b/glib/gmappedfile.h
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gmarkup.h b/glib/gmarkup.h
index a69f6e2a6..a8865da9f 100644
--- a/glib/gmarkup.h
+++ b/glib/gmarkup.h
@@ -18,7 +18,7 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gmem.h b/glib/gmem.h
index 5927f92ec..376e466e9 100644
--- a/glib/gmem.h
+++ b/glib/gmem.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gmessages.h b/glib/gmessages.h
index c5220e355..8e174cc79 100644
--- a/glib/gmessages.h
+++ b/glib/gmessages.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gnode.h b/glib/gnode.h
index 6ad6e54b3..675b8b175 100644
--- a/glib/gnode.h
+++ b/glib/gnode.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/goption.h b/glib/goption.h
index 340a84cff..7d1f2a1de 100644
--- a/glib/goption.h
+++ b/glib/goption.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gpattern.h b/glib/gpattern.h
index b653d713f..e692d9022 100644
--- a/glib/gpattern.h
+++ b/glib/gpattern.h
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gprimes.h b/glib/gprimes.h
index af5728602..19f570218 100644
--- a/glib/gprimes.h
+++ b/glib/gprimes.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gqsort.h b/glib/gqsort.h
index 3a47a584e..05b4b66f3 100644
--- a/glib/gqsort.h
+++ b/glib/gqsort.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gquark.h b/glib/gquark.h
index 324c95666..78b9546be 100644
--- a/glib/gquark.h
+++ b/glib/gquark.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gqueue.h b/glib/gqueue.h
index 591a09a00..dd236d5d8 100644
--- a/glib/gqueue.h
+++ b/glib/gqueue.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/grand.h b/glib/grand.h
index 039799206..182616b3c 100644
--- a/glib/grand.h
+++ b/glib/grand.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gregex.h b/glib/gregex.h
index bc5fff87d..1110ad04b 100644
--- a/glib/gregex.h
+++ b/glib/gregex.h
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gscanner.h b/glib/gscanner.h
index 3b7ad6fab..2063db6cb 100644
--- a/glib/gscanner.h
+++ b/glib/gscanner.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gsequence.h b/glib/gsequence.h
index 6a21c3eeb..3e5a03dea 100644
--- a/glib/gsequence.h
+++ b/glib/gsequence.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gshell.h b/glib/gshell.h
index 130f1008c..ddb4ec564 100644
--- a/glib/gshell.h
+++ b/glib/gshell.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gslice.h b/glib/gslice.h
index 962199e09..4b4b9e53e 100644
--- a/glib/gslice.h
+++ b/glib/gslice.h
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gslist.h b/glib/gslist.h
index 35a39a32c..5652145cc 100644
--- a/glib/gslist.h
+++ b/glib/gslist.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gspawn.h b/glib/gspawn.h
index c9da1a866..84e0eeb31 100644
--- a/glib/gspawn.h
+++ b/glib/gspawn.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
index 134ddb71f..62af3be16 100644
--- a/glib/gstrfuncs.h
+++ b/glib/gstrfuncs.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gstring.h b/glib/gstring.h
index 4e5e1ec66..80d7b1ea5 100644
--- a/glib/gstring.h
+++ b/glib/gstring.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gstringchunk.h b/glib/gstringchunk.h
index 965488590..5ab2e8adf 100644
--- a/glib/gstringchunk.h
+++ b/glib/gstringchunk.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gtestutils.h b/glib/gtestutils.h
index 1e49ad969..0184c7cc3 100644
--- a/glib/gtestutils.h
+++ b/glib/gtestutils.h
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gthread.h b/glib/gthread.h
index ba7024d68..072396f04 100644
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gthreadpool.h b/glib/gthreadpool.h
index b11c10a21..3a1f29806 100644
--- a/glib/gthreadpool.h
+++ b/glib/gthreadpool.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gtimer.h b/glib/gtimer.h
index 743eed1f9..b927fc372 100644
--- a/glib/gtimer.h
+++ b/glib/gtimer.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gtimezone.h b/glib/gtimezone.h
index 58b0db938..c877e8f4c 100644
--- a/glib/gtimezone.h
+++ b/glib/gtimezone.h
@@ -19,7 +19,7 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gtree.h b/glib/gtree.h
index 0284c0818..b4a6ce63c 100644
--- a/glib/gtree.h
+++ b/glib/gtree.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gtypes.h b/glib/gtypes.h
index 8e77563da..db07201e8 100644
--- a/glib/gtypes.h
+++ b/glib/gtypes.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gunicode.h b/glib/gunicode.h
index 2216ebfc6..15b3a95d1 100644
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -19,7 +19,7 @@
  *   Boston, MA 02111-1307, USA.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gurifuncs.h b/glib/gurifuncs.h
index bbc8f8800..809780668 100644
--- a/glib/gurifuncs.h
+++ b/glib/gurifuncs.h
@@ -20,7 +20,7 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gutils.h b/glib/gutils.h
index fe5f2701b..f43993407 100644
--- a/glib/gutils.h
+++ b/glib/gutils.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gvariant.h b/glib/gvariant.h
index 84fe95caa..9abcc0b87 100644
--- a/glib/gvariant.h
+++ b/glib/gvariant.h
@@ -20,7 +20,7 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gvarianttype.h b/glib/gvarianttype.h
index be9555ebb..99bbdad36 100644
--- a/glib/gvarianttype.h
+++ b/glib/gvarianttype.h
@@ -20,7 +20,7 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif
 
diff --git a/glib/gwin32.h b/glib/gwin32.h
index f368c1d0a..2d278d2bc 100644
--- a/glib/gwin32.h
+++ b/glib/gwin32.h
@@ -24,7 +24,7 @@
  * GLib at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
 #error "Only <glib.h> can be included directly."
 #endif