diff --git a/ChangeLog b/ChangeLog
index f246ec7b85..428ad65ec4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-28  Michael Natterer  <mitch@gimp.org>
+
+	* configure.in: last but not least, add G_DISABLE_SINGLE_INCLUDES,
+	GDK_PIXBUF_DISABLE_SINGLE_INCLUDES and GTK_DISABLE_SINGLE_INCLUDES
+	to CPPFLAGS so it's impossible to commit code that would break
+	apps which use DISABLE_INCLUDE defines.
+
 2008-05-28  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/gtk.h: define __GTK_H_INSIDE__ around including all other
diff --git a/configure.in b/configure.in
index 16eeb5614e..eaf870501a 100644
--- a/configure.in
+++ b/configure.in
@@ -313,6 +313,8 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
+CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DPANGO_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+
 # Ensure MSVC-compatible struct packing convention is used when
 # compiling for Win32 with gcc.
 # What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while