diff --git a/expat/Makefile.in b/expat/Makefile.in
index 4c78a6cc..5330f932 100644
--- a/expat/Makefile.in
+++ b/expat/Makefile.in
@@ -102,7 +102,7 @@ LIBTOOL = @LIBTOOL@
 INCLUDES = -I$(srcdir)/lib -I.
 LDFLAGS = @LDFLAGS@
 CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@
+CFLAGS = @CFLAGS@ -DHAVE_EXPAT_CONFIG_H
 VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@
 
 ### autoconf this?
diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index d1839c68..6b056c10 100644
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -12,7 +12,9 @@
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
 #else
+#ifdef HAVE_EXPAT_CONFIG_H
 #include <expat_config.h>
+#endif
 #endif /* ndef COMPILED_FROM_DSP */
 
 #include "expat.h"
diff --git a/expat/lib/xmlrole.c b/expat/lib/xmlrole.c
index 8ef185d5..83c0d71f 100644
--- a/expat/lib/xmlrole.c
+++ b/expat/lib/xmlrole.c
@@ -7,7 +7,9 @@
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
 #else
+#ifdef HAVE_EXPAT_CONFIG_H
 #include <expat_config.h>
+#endif
 #endif /* ndef COMPILED_FROM_DSP */
 
 #include "internal.h"
diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c
index 5f101afe..962df0e9 100644
--- a/expat/lib/xmltok.c
+++ b/expat/lib/xmltok.c
@@ -7,7 +7,9 @@
 #elif defined(MACOS_CLASSIC)
 #include "macconfig.h"
 #else
+#ifdef HAVE_EXPAT_CONFIG_H
 #include <expat_config.h>
+#endif
 #endif /* ndef COMPILED_FROM_DSP */
 
 #include "internal.h"
diff --git a/expat/tests/chardata.c b/expat/tests/chardata.c
index 4351f4ce..5736afc6 100644
--- a/expat/tests/chardata.c
+++ b/expat/tests/chardata.c
@@ -4,7 +4,9 @@
    chardata.c
 */
 
+#ifdef HAVE_EXPAT_CONFIG_H
 #include <expat_config.h>
+#endif
 #ifdef HAVE_CHECK_H
 #include <check.h>
 #else
diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index f5bc3d1c..ac968a96 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -4,7 +4,10 @@
    runtest.c : run the Expat test suite
 */
 
+#ifdef HAVE_EXPAT_CONFIG_H
 #include <expat_config.h>
+#endif
+
 #ifdef HAVE_CHECK_H
 #include <check.h>
 #else
diff --git a/expat/xmlwf/xmlfile.c b/expat/xmlwf/xmlfile.c
index 690be523..6cb07153 100755
--- a/expat/xmlwf/xmlfile.c
+++ b/expat/xmlwf/xmlfile.c
@@ -10,8 +10,10 @@
 #ifdef COMPILED_FROM_DSP
 #include "winconfig.h"
 #else
+#ifdef HAVE_EXPAT_CONFIG_H
 #include "expat_config.h"
 #endif
+#endif
 #include "expat.h"
 #include "xmlfile.h"
 #include "xmltchar.h"