Backport last checkin:

SF # 607253, header file problems, reported by Ralf W. Grosse-Kunstleve

Don't pollute the namespace when protecting against multiple header inclusion.
Prefix with Py_ and use standard naming convention Py_FILENAME_H.

Include/cStringIO.h

-#ifndef CSTRINGIO_INCLUDED
-#define CSTRINGIO_INCLUDED
+#ifndef Py_CSTRINGIO_H
+#define Py_CSTRINGIO_H
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -134,4 +134,4 @@ xxxPyCObject_Import(char *module_name, char *name)
 #ifdef __cplusplus
 }
 #endif
-#endif /* CSTRINGIO_INCLUDED */
+#endif /* !Py_CSTRINGIO_H */

Include/complexobject.h

 /* Complex number structure */
 
-#ifndef COMPLEXOBJECT_H
-#define COMPLEXOBJECT_H
+#ifndef Py_COMPLEXOBJECT_H
+#define Py_COMPLEXOBJECT_H
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -55,4 +55,4 @@ extern DL_IMPORT(Py_complex) PyComplex_AsCComplex(PyObject *op);
 #ifdef __cplusplus
 }
 #endif
-#endif /* !COMPLEXOBJECT_H */
+#endif /* !Py_COMPLEXOBJECT_H */