--- a/Python/Modules/pyexpat.c
+++ b/Python/Modules/pyexpat.c
@@ -2,7 +2,7 @@
 #include <ctype.h>
 
 #include "frameobject.h"
-#include "expat.h"
+#include <expat.h>
 
 #include "pyexpat.h"
 
--- a/Python/setup.py
+++ b/Python/setup.py
@@ -991,18 +991,12 @@ class PyBuildExt(build_ext):
         # More information on Expat can be found at www.libexpat.org.
         #
         expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
         define_macros = [
-            ('HAVE_EXPAT_CONFIG_H', '1'),
         ]
 
         exts.append(Extension('pyexpat',
-                              define_macros = define_macros,
-                              include_dirs = [expatinc],
-                              sources = ['pyexpat.c',
-                                         'expat/xmlparse.c',
-                                         'expat/xmlrole.c',
-                                         'expat/xmltok.c',
-                                         ],
+                              sources = ['pyexpat.c'],
+                              libraries = ['expat'],
                               ))
 
         # Fredrik Lundh's cElementTree module.  Note that this also