Index: Python/dynload_win.c
===================================================================
--- Python/dynload_win.c	(revision 86847)
+++ Python/dynload_win.c	(working copy)
@@ -12,7 +12,7 @@
 #include <windows.h>
 
 // "activation context" magic - see dl_nt.c...
-extern ULONG_PTR _Py_ActivateActCtx();
+extern ULONG_PTR _Py_ActivateActCtx(void);
 void _Py_DeactivateActCtx(ULONG_PTR cookie);
 
 const struct filedescr _PyImport_DynLoadFiletab[] = {
@@ -28,7 +28,7 @@
 /* Case insensitive string compare, to avoid any dependencies on particular
    C RTL implementations */
 
-static int strcasecmp (char *string1, char *string2)
+static int py_strcasecmp (char *string1, char *string2)
 {
     int first, second;
 
@@ -176,7 +176,7 @@
         char pathbuf[260];
         LPTSTR dummy;
         unsigned int old_mode;
-        ULONG_PTR cookie = 0;
+
         /* We use LoadLibraryEx so Windows looks for dependent DLLs
             in directory of pathname first.  However, Windows95
             can sometimes not work correctly unless the absolute
@@ -261,7 +261,7 @@
             import_python = GetPythonImport(hDLL);
 
             if (import_python &&
-                strcasecmp(buffer,import_python)) {
+                py_strcasecmp(buffer,import_python)) {
                 PyOS_snprintf(buffer, sizeof(buffer),
                               "Module use of %.150s conflicts "
                               "with this version of Python.",
Index: PC/dl_nt.c
===================================================================
--- PC/dl_nt.c	(revision 86847)
+++ PC/dl_nt.c	(working copy)
@@ -44,9 +44,9 @@
 static PFN_ADDREFACTCTX pfnAddRefActCtx = NULL;
 static PFN_RELEASEACTCTX pfnReleaseActCtx = NULL;
 
-void _LoadActCtxPointers()
+void _LoadActCtxPointers(void)
 {
-    HINSTANCE hKernel32 = GetModuleHandleW(L"kernel32.dll");
+    HINSTANCE hKernel32 = GetModuleHandle(TEXT("KERNEL32"));
     if (hKernel32)
         pfnGetCurrentActCtx = (PFN_GETCURRENTACTCTX) GetProcAddress(hKernel32, "GetCurrentActCtx");
     // If we can't load GetCurrentActCtx (ie, pre XP) , don't bother with the rest.
@@ -58,7 +58,7 @@
     }
 }
 
-ULONG_PTR _Py_ActivateActCtx()
+ULONG_PTR _Py_ActivateActCtx(void)
 {
     ULONG_PTR ret = 0;
     if (PyWin_DLLhActivationContext && pfnActivateActCtx)
Index: Modules/posixmodule.c
===================================================================
--- Modules/posixmodule.c	(revision 86847)
+++ Modules/posixmodule.c	(working copy)
@@ -981,7 +981,15 @@
     int st_ctime_nsec;
 };
 
-static __int64 secs_between_epochs = 11644473600; /* Seconds between 1.1.1601 and 1.1.1970 */
+/* Seconds between 1.1.1601 and 1.1.1970 */
+static __int64 secs_between_epochs =
+#if defined _MSC_VER
+    11644473600i64;
+#elif defined __GNUC__
+    11644473600LL;
+#else
+    11644473600;
+#endif
 
 static void
 FILE_TIME_to_time_t_nsec(FILETIME *in_ptr, int *time_out, int* nsec_out)