diff -r 4accc35cbfcf Modules/_json.c
--- a/Modules/_json.c	Tue Mar 17 10:49:17 2015 +0100
+++ b/Modules/_json.c	Tue Mar 17 11:11:11 2015 +0100
@@ -1995,7 +1995,7 @@ static struct PyModuleDef jsonmodule = {
         NULL
 };
 
-PyObject*
+PyMODINIT_FUNC
 PyInit__json(void)
 {
     PyObject *m = PyModule_Create(&jsonmodule);
diff -r 4accc35cbfcf Modules/_scproxy.c
--- a/Modules/_scproxy.c	Tue Mar 17 10:49:17 2015 +0100
+++ b/Modules/_scproxy.c	Tue Mar 17 11:11:11 2015 +0100
@@ -249,7 +249,7 @@ static struct PyModuleDef mod_module = {
 extern "C" {
 #endif
 
-PyObject*
+PyMODINIT_FUNC
 PyInit__scproxy(void)
 {
     return PyModule_Create(&mod_module);
diff -r 4accc35cbfcf Modules/cjkcodecs/cjkcodecs.h
--- a/Modules/cjkcodecs/cjkcodecs.h	Tue Mar 17 10:49:17 2015 +0100
+++ b/Modules/cjkcodecs/cjkcodecs.h	Tue Mar 17 11:11:11 2015 +0100
@@ -401,7 +401,7 @@ errorexit:
         NULL,                                                           \
         NULL                                                            \
     };                                                                  \
-    PyObject*                                                           \
+    PyMODINIT_FUNC                                                      \
     PyInit__codecs_##loc(void)                                          \
     {                                                                   \
         PyObject *m = PyModule_Create(&__module);                       \
diff -r 4accc35cbfcf Modules/nismodule.c
--- a/Modules/nismodule.c	Tue Mar 17 10:49:17 2015 +0100
+++ b/Modules/nismodule.c	Tue Mar 17 11:11:11 2015 +0100
@@ -456,8 +456,8 @@ static struct PyModuleDef nismodule = {
     NULL
 };
 
-PyObject*
-PyInit_nis (void)
+PyMODINIT_FUNC
+PyInit_nis(void)
 {
     PyObject *m, *d;
     m = PyModule_Create(&nismodule);
diff -r 4accc35cbfcf Modules/pyexpat.c
--- a/Modules/pyexpat.c	Tue Mar 17 10:49:17 2015 +0100
+++ b/Modules/pyexpat.c	Tue Mar 17 11:11:11 2015 +0100
@@ -1900,16 +1900,6 @@ PyDoc_STRVAR(pyexpat_module_documentatio
 #define MODULE_INITFUNC PyInit_pyexpat
 #endif
 
-#ifndef PyMODINIT_FUNC
-#   ifdef MS_WINDOWS
-#       define PyMODINIT_FUNC __declspec(dllexport) void
-#   else
-#       define PyMODINIT_FUNC void
-#   endif
-#endif
-
-PyMODINIT_FUNC MODULE_INITFUNC(void);  /* avoid compiler warnings */
-
 static struct PyModuleDef pyexpatmodule = {
         PyModuleDef_HEAD_INIT,
         MODULE_NAME,
diff -r 4accc35cbfcf PC/config.c
--- a/PC/config.c	Tue Mar 17 10:49:17 2015 +0100
+++ b/PC/config.c	Tue Mar 17 11:11:11 2015 +0100
@@ -5,74 +5,74 @@
 
 #include "Python.h"
 
-extern PyObject* PyInit_array(void);
+extern PyMODINIT_FUNC PyInit_array(void);
 #ifndef MS_WINI64
-extern PyObject* PyInit_audioop(void);
+extern PyMODINIT_FUNC PyInit_audioop(void);
 #endif
-extern PyObject* PyInit_binascii(void);
-extern PyObject* PyInit_cmath(void);
-extern PyObject* PyInit_errno(void);
-extern PyObject* PyInit_faulthandler(void);
-extern PyObject* PyInit__tracemalloc(void);
-extern PyObject* PyInit_gc(void);
-extern PyObject* PyInit_math(void);
-extern PyObject* PyInit__md5(void);
-extern PyObject* PyInit_nt(void);
-extern PyObject* PyInit__operator(void);
-extern PyObject* PyInit__signal(void);
-extern PyObject* PyInit__sha1(void);
-extern PyObject* PyInit__sha256(void);
-extern PyObject* PyInit__sha512(void);
-extern PyObject* PyInit_time(void);
-extern PyObject* PyInit__thread(void);
+extern PyMODINIT_FUNC PyInit_binascii(void);
+extern PyMODINIT_FUNC PyInit_cmath(void);
+extern PyMODINIT_FUNC PyInit_errno(void);
+extern PyMODINIT_FUNC PyInit_faulthandler(void);
+extern PyMODINIT_FUNC PyInit__tracemalloc(void);
+extern PyMODINIT_FUNC PyInit_gc(void);
+extern PyMODINIT_FUNC PyInit_math(void);
+extern PyMODINIT_FUNC PyInit__md5(void);
+extern PyMODINIT_FUNC PyInit_nt(void);
+extern PyMODINIT_FUNC PyInit__operator(void);
+extern PyMODINIT_FUNC PyInit__signal(void);
+extern PyMODINIT_FUNC PyInit__sha1(void);
+extern PyMODINIT_FUNC PyInit__sha256(void);
+extern PyMODINIT_FUNC PyInit__sha512(void);
+extern PyMODINIT_FUNC PyInit_time(void);
+extern PyMODINIT_FUNC PyInit__thread(void);
 #ifdef WIN32
-extern PyObject* PyInit_msvcrt(void);
-extern PyObject* PyInit__locale(void);
+extern PyMODINIT_FUNC PyInit_msvcrt(void);
+extern PyMODINIT_FUNC PyInit__locale(void);
 #endif
-extern PyObject* PyInit__codecs(void);
-extern PyObject* PyInit__weakref(void);
-extern PyObject* PyInit_xxsubtype(void);
-extern PyObject* PyInit_zipimport(void);
-extern PyObject* PyInit__random(void);
-extern PyObject* PyInit_itertools(void);
-extern PyObject* PyInit__collections(void);
-extern PyObject* PyInit__heapq(void);
-extern PyObject* PyInit__bisect(void);
-extern PyObject* PyInit__symtable(void);
-extern PyObject* PyInit_mmap(void);
-extern PyObject* PyInit__csv(void);
-extern PyObject* PyInit__sre(void);
-extern PyObject* PyInit_parser(void);
-extern PyObject* PyInit_winreg(void);
-extern PyObject* PyInit__struct(void);
-extern PyObject* PyInit__datetime(void);
-extern PyObject* PyInit__functools(void);
-extern PyObject* PyInit__json(void);
-extern PyObject* PyInit_zlib(void);
+extern PyMODINIT_FUNC PyInit__codecs(void);
+extern PyMODINIT_FUNC PyInit__weakref(void);
+extern PyMODINIT_FUNC PyInit_xxsubtype(void);
+extern PyMODINIT_FUNC PyInit_zipimport(void);
+extern PyMODINIT_FUNC PyInit__random(void);
+extern PyMODINIT_FUNC PyInit_itertools(void);
+extern PyMODINIT_FUNC PyInit__collections(void);
+extern PyMODINIT_FUNC PyInit__heapq(void);
+extern PyMODINIT_FUNC PyInit__bisect(void);
+extern PyMODINIT_FUNC PyInit__symtable(void);
+extern PyMODINIT_FUNC PyInit_mmap(void);
+extern PyMODINIT_FUNC PyInit__csv(void);
+extern PyMODINIT_FUNC PyInit__sre(void);
+extern PyMODINIT_FUNC PyInit_parser(void);
+extern PyMODINIT_FUNC PyInit_winreg(void);
+extern PyMODINIT_FUNC PyInit__struct(void);
+extern PyMODINIT_FUNC PyInit__datetime(void);
+extern PyMODINIT_FUNC PyInit__functools(void);
+extern PyMODINIT_FUNC PyInit__json(void);
+extern PyMODINIT_FUNC PyInit_zlib(void);
 
-extern PyObject* PyInit__multibytecodec(void);
-extern PyObject* PyInit__codecs_cn(void);
-extern PyObject* PyInit__codecs_hk(void);
-extern PyObject* PyInit__codecs_iso2022(void);
-extern PyObject* PyInit__codecs_jp(void);
-extern PyObject* PyInit__codecs_kr(void);
-extern PyObject* PyInit__codecs_tw(void);
-extern PyObject* PyInit__winapi(void);
-extern PyObject* PyInit__lsprof(void);
-extern PyObject* PyInit__ast(void);
-extern PyObject* PyInit__io(void);
-extern PyObject* PyInit__pickle(void);
-extern PyObject* PyInit_atexit(void);
-extern PyObject* _PyWarnings_Init(void);
-extern PyObject* PyInit__string(void);
-extern PyObject* PyInit__stat(void);
-extern PyObject* PyInit__opcode(void);
+extern PyMODINIT_FUNC PyInit__multibytecodec(void);
+extern PyMODINIT_FUNC PyInit__codecs_cn(void);
+extern PyMODINIT_FUNC PyInit__codecs_hk(void);
+extern PyMODINIT_FUNC PyInit__codecs_iso2022(void);
+extern PyMODINIT_FUNC PyInit__codecs_jp(void);
+extern PyMODINIT_FUNC PyInit__codecs_kr(void);
+extern PyMODINIT_FUNC PyInit__codecs_tw(void);
+extern PyMODINIT_FUNC PyInit__winapi(void);
+extern PyMODINIT_FUNC PyInit__lsprof(void);
+extern PyMODINIT_FUNC PyInit__ast(void);
+extern PyMODINIT_FUNC PyInit__io(void);
+extern PyMODINIT_FUNC PyInit__pickle(void);
+extern PyMODINIT_FUNC PyInit_atexit(void);
+extern PyMODINIT_FUNC _PyWarnings_Init(void);
+extern PyMODINIT_FUNC PyInit__string(void);
+extern PyMODINIT_FUNC PyInit__stat(void);
+extern PyMODINIT_FUNC PyInit__opcode(void);
 
 /* tools/freeze/makeconfig.py marker for additional "extern" */
 /* -- ADDMODULE MARKER 1 -- */
 
-extern PyObject* PyMarshal_Init(void);
-extern PyObject* PyInit_imp(void);
+extern PyMODINIT_FUNC PyMarshal_Init(void);
+extern PyMODINIT_FUNC PyInit_imp(void);
 
 struct _inittab _PyImport_Inittab[] = {