diff --git a/ChangeLog b/ChangeLog
index 5be69bad7..b0da78d4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-30  Neil Roberts  <neil@o-hand.com>
+
+        * clutter/x11/clutter-event-x11.c:
+        * clutter/win32/clutter-event-win32.c: Use the HAVE_CONFIG_H guard
+        around #include "config.h"
+
 2008-06-30  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* clutter/Makefile.am:
diff --git a/clutter/win32/clutter-event-win32.c b/clutter/win32/clutter-event-win32.c
index af27c38d5..22654adaf 100644
--- a/clutter/win32/clutter-event-win32.c
+++ b/clutter/win32/clutter-event-win32.c
@@ -19,7 +19,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include "clutter-stage-win32.h"
 #include "clutter-backend-win32.h"
diff --git a/clutter/x11/clutter-event-x11.c b/clutter/x11/clutter-event-x11.c
index 38efe33d1..793edf879 100644
--- a/clutter/x11/clutter-event-x11.c
+++ b/clutter/x11/clutter-event-x11.c
@@ -19,7 +19,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include "clutter-stage-x11.h"
 #include "clutter-backend-x11.h"