PyModule_AddStringConstant():  Make this static since it isn't used
                               elsewhere in 1.5.2.
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index 8ef36d8..543648b 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1,5 +1,9 @@
 #include "Python.h"
+#ifdef HAVE_EXPAT_H
+#include "expat.h"
+#else
 #include "xmlparse.h"
+#endif
 
 enum HandlerTypes {
     StartElement,
@@ -877,7 +881,7 @@
         return 0;
 }
 
-int 
+static int 
 PyModule_AddStringConstant(PyObject *m, char *name, char *value)
 {
 	return PyModule_AddObject(m, name, PyString_FromString(value));