diff --git a/ChangeLog b/ChangeLog
index 0f5ddc8565..cd1e16857d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-30  Michael Natterer  <mitch@imendio.com>
+
+	* gtk/gtkmountoperation.h
+	* gtk/gtkshow.h
+	* gtk/gtktestutils.h
+	* gtk/gtktoolshell.h: no need to allow disabling single includes
+	conditionally in these new files. Simply forbid including them
+	individually from the beginning.
+
 2008-05-30  Tor Lillqvist  <tml@novell.com>
 
 	Bug 533108 - leak of GDI region in function 'handle_wm_paint'
diff --git a/gtk/gtkmountoperation.h b/gtk/gtkmountoperation.h
index 7d93e65776..8e93cfe47e 100644
--- a/gtk/gtkmountoperation.h
+++ b/gtk/gtkmountoperation.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/gtkshow.h b/gtk/gtkshow.h
index 5d83d68645..44e65c8117 100644
--- a/gtk/gtkshow.h
+++ b/gtk/gtkshow.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/gtktestutils.h b/gtk/gtktestutils.h
index f0950de2f3..c6fe4fa5b1 100644
--- a/gtk/gtktestutils.h
+++ b/gtk/gtktestutils.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/gtktoolshell.h b/gtk/gtktoolshell.h
index 87bb647ce2..fcd07aa5fa 100644
--- a/gtk/gtktoolshell.h
+++ b/gtk/gtktoolshell.h
@@ -20,7 +20,7 @@
  *   Mathias Hasselmann
  */
 
-#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