diff --git a/Include/modsupport.h b/Include/modsupport.h
index 86dbb0e648e..c50d769df46 100644
--- a/Include/modsupport.h
+++ b/Include/modsupport.h
@@ -1,9 +1,3 @@
-#ifndef Py_MODSUPPORT_H
-#define Py_MODSUPPORT_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /***********************************************************
 Copyright (c) 2000, BeOpen.com.
 Copyright (c) 1995-2000, Corporation for National Research Initiatives.
@@ -14,17 +8,23 @@ See the file "Misc/COPYRIGHT" for information on usage and
 redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 ******************************************************************/
 
+#ifndef Py_MODSUPPORT_H
+#define Py_MODSUPPORT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Module support interface */
 
 #ifdef HAVE_STDARG_PROTOTYPES
 
 #include <stdarg.h>
 
-extern DL_IMPORT(int) PyArg_Parse Py_PROTO((PyObject *, char *, ...));
-extern DL_IMPORT(int) PyArg_ParseTuple Py_PROTO((PyObject *, char *, ...));
-extern DL_IMPORT(int) PyArg_ParseTupleAndKeywords Py_PROTO((PyObject *, PyObject *,
-						 char *, char **, ...));
-extern DL_IMPORT(PyObject *) Py_BuildValue Py_PROTO((char *, ...));
+extern DL_IMPORT(int) PyArg_Parse(PyObject *, char *, ...);
+extern DL_IMPORT(int) PyArg_ParseTuple(PyObject *, char *, ...);
+extern DL_IMPORT(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
+                                                  char *, char **, ...);
+extern DL_IMPORT(PyObject *) Py_BuildValue(char *, ...);
 
 #else
 
@@ -37,8 +37,8 @@ extern DL_IMPORT(PyObject *) Py_BuildValue();
 
 #endif
 
-extern DL_IMPORT(int) PyArg_VaParse Py_PROTO((PyObject *, char *, va_list));
-extern DL_IMPORT(PyObject *) Py_VaBuildValue Py_PROTO((char *, va_list));
+extern DL_IMPORT(int) PyArg_VaParse(PyObject *, char *, va_list);
+extern DL_IMPORT(PyObject *) Py_VaBuildValue(char *, va_list);
 
 #define PYTHON_API_VERSION 1009
 #define PYTHON_API_STRING "1009"
@@ -90,8 +90,10 @@ extern DL_IMPORT(PyObject *) Py_VaBuildValue Py_PROTO((char *, va_list));
 #define Py_InitModule4 Py_InitModule4TraceRefs
 #endif
 
-extern DL_IMPORT(PyObject *) Py_InitModule4 Py_PROTO((char *, PyMethodDef *,
-					  char *, PyObject *, int));
+extern DL_IMPORT(PyObject *) Py_InitModule4(char *name, PyMethodDef *methods,
+                                            char *doc, PyObject *self,
+                                            int apiver);
+
 #define Py_InitModule(name, methods) \
 	Py_InitModule4(name, methods, (char *)NULL, (PyObject *)NULL, \
 		       PYTHON_API_VERSION)
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index e521fe2bad6..f461068ab28 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -16,18 +16,18 @@ redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 /* Error handling definitions */
 
-DL_IMPORT(void) PyErr_SetNone Py_PROTO((PyObject *));
-DL_IMPORT(void) PyErr_SetObject Py_PROTO((PyObject *, PyObject *));
-DL_IMPORT(void) PyErr_SetString Py_PROTO((PyObject *, const char *));
-DL_IMPORT(PyObject *) PyErr_Occurred Py_PROTO((void));
-DL_IMPORT(void) PyErr_Clear Py_PROTO((void));
-DL_IMPORT(void) PyErr_Fetch Py_PROTO((PyObject **, PyObject **, PyObject **));
-DL_IMPORT(void) PyErr_Restore Py_PROTO((PyObject *, PyObject *, PyObject *));
+DL_IMPORT(void) PyErr_SetNone(PyObject *);
+DL_IMPORT(void) PyErr_SetObject(PyObject *, PyObject *);
+DL_IMPORT(void) PyErr_SetString(PyObject *, const char *);
+DL_IMPORT(PyObject *) PyErr_Occurred(void);
+DL_IMPORT(void) PyErr_Clear(void);
+DL_IMPORT(void) PyErr_Fetch(PyObject **, PyObject **, PyObject **);
+DL_IMPORT(void) PyErr_Restore(PyObject *, PyObject *, PyObject *);
 
 /* Error testing and normalization */
-DL_IMPORT(int) PyErr_GivenExceptionMatches Py_PROTO((PyObject *, PyObject *));
-DL_IMPORT(int) PyErr_ExceptionMatches Py_PROTO((PyObject *));
-DL_IMPORT(void) PyErr_NormalizeException Py_PROTO((PyObject**, PyObject**, PyObject**));
+DL_IMPORT(int) PyErr_GivenExceptionMatches(PyObject *, PyObject *);
+DL_IMPORT(int) PyErr_ExceptionMatches(PyObject *);
+DL_IMPORT(void) PyErr_NormalizeException(PyObject**, PyObject**, PyObject**);
 
 
 /* Predefined exceptions */
@@ -54,6 +54,8 @@ extern DL_IMPORT(PyObject *) PyExc_OverflowError;
 extern DL_IMPORT(PyObject *) PyExc_RuntimeError;
 extern DL_IMPORT(PyObject *) PyExc_NotImplementedError;
 extern DL_IMPORT(PyObject *) PyExc_SyntaxError;
+extern DL_IMPORT(PyObject *) PyExc_IndentationError;
+extern DL_IMPORT(PyObject *) PyExc_TabError;
 extern DL_IMPORT(PyObject *) PyExc_SystemError;
 extern DL_IMPORT(PyObject *) PyExc_SystemExit;
 extern DL_IMPORT(PyObject *) PyExc_TypeError;
@@ -70,25 +72,25 @@ extern DL_IMPORT(PyObject *) PyExc_MemoryErrorInst;
 
 /* Convenience functions */
 
-extern DL_IMPORT(int) PyErr_BadArgument Py_PROTO((void));
-extern DL_IMPORT(PyObject *) PyErr_NoMemory Py_PROTO((void));
-extern DL_IMPORT(PyObject *) PyErr_SetFromErrno Py_PROTO((PyObject *));
-extern DL_IMPORT(PyObject *) PyErr_SetFromErrnoWithFilename Py_PROTO((PyObject *, char *));
-extern DL_IMPORT(PyObject *) PyErr_Format Py_PROTO((PyObject *, const char *, ...));
+extern DL_IMPORT(int) PyErr_BadArgument(void);
+extern DL_IMPORT(PyObject *) PyErr_NoMemory(void);
+extern DL_IMPORT(PyObject *) PyErr_SetFromErrno(PyObject *);
+extern DL_IMPORT(PyObject *) PyErr_SetFromErrnoWithFilename(PyObject *, char *);
+extern DL_IMPORT(PyObject *) PyErr_Format(PyObject *, const char *, ...);
 #ifdef MS_WINDOWS
 extern DL_IMPORT(PyObject *) PyErr_SetFromWindowsErrWithFilename(int, const char *);
 extern DL_IMPORT(PyObject *) PyErr_SetFromWindowsErr(int);
 #endif
 
-extern DL_IMPORT(void) PyErr_BadInternalCall Py_PROTO((void));
+extern DL_IMPORT(void) PyErr_BadInternalCall(void);
 
 /* Function to create a new exception */
-DL_IMPORT(PyObject *) PyErr_NewException Py_PROTO((char *name, PyObject *base,
-				       PyObject *dict));
+DL_IMPORT(PyObject *) PyErr_NewException(char *name, PyObject *base,
+                                         PyObject *dict);
 
 /* In sigcheck.c or signalmodule.c */
-extern DL_IMPORT(int) PyErr_CheckSignals Py_PROTO((void));
-extern DL_IMPORT(void) PyErr_SetInterrupt Py_PROTO((void));
+extern DL_IMPORT(int) PyErr_CheckSignals(void);
+extern DL_IMPORT(void) PyErr_SetInterrupt(void);
 	
 
 #ifdef __cplusplus