diff --git a/Modules/_decimal/libmpdec/io.c b/Modules/_decimal/libmpdec/io.c
index 3aadfb0437979c..1cc719a9263f69 100644
--- a/Modules/_decimal/libmpdec/io.c
+++ b/Modules/_decimal/libmpdec/io.c
@@ -38,7 +38,7 @@
 #include "bits.h"
 #include "constants.h"
 #include "typearith.h"
-#include "io.h"
+#include "mpd_io.h"
 
 
 /* This file contains functions for decimal <-> string conversions, including
diff --git a/Modules/_decimal/libmpdec/io.h b/Modules/_decimal/libmpdec/mpd_io.h
similarity index 100%
rename from Modules/_decimal/libmpdec/io.h
rename to Modules/_decimal/libmpdec/mpd_io.h
diff --git a/Modules/_decimal/libmpdec/mpdecimal.c b/Modules/_decimal/libmpdec/mpdecimal.c
index 328ab9224628a4..5812bcd2ec2300 100644
--- a/Modules/_decimal/libmpdec/mpdecimal.c
+++ b/Modules/_decimal/libmpdec/mpdecimal.c
@@ -54,7 +54,7 @@
 
 
 #if defined(_MSC_VER)
-  #define ALWAYS_INLINE __forceinline
+  #define ALWAYS_INLINE extern __forceinline
 #elif defined(LEGACY_COMPILER)
   #define ALWAYS_INLINE
   #undef inline
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
index f4d3cbd49f8bd7..f7ad1769905a9a 100644
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -21,7 +21,7 @@
 #endif /* HAVE_SYS_STAT_H */
 
 #ifdef MS_WINDOWS
-#include <consoleapi.h>
+#include <windows.h>
 #endif
 
 /* Various interned strings */
diff --git a/Modules/_winapi.c b/Modules/_winapi.c
index 1606f0da772c95..d81215f89c70fa 100644
--- a/Modules/_winapi.c
+++ b/Modules/_winapi.c
@@ -147,7 +147,7 @@ overlapped_dealloc(OverlappedObject *self)
 
 /*[clinic input]
 module _winapi
-class _winapi.Overlapped "OverlappedObject *" "&OverlappedType"
+class _winapi.Overlapped "OverlappedObject *" "&WinApiOverlappedType"
 [clinic start generated code]*/
 /*[clinic end generated code: output=da39a3ee5e6b4b0d input=c13d3f5fd1dabb84]*/
 
@@ -295,7 +295,7 @@ static PyMemberDef overlapped_members[] = {
     {NULL}
 };
 
-PyTypeObject OverlappedType = {
+PyTypeObject WinApiOverlappedType = {
     PyVarObject_HEAD_INIT(NULL, 0)
     /* tp_name           */ "_winapi.Overlapped",
     /* tp_basicsize      */ sizeof(OverlappedObject),
@@ -341,7 +341,7 @@ new_overlapped(HANDLE handle)
 {
     OverlappedObject *self;
 
-    self = PyObject_New(OverlappedObject, &OverlappedType);
+    self = PyObject_New(OverlappedObject, &WinApiOverlappedType);
     if (!self)
         return NULL;
     self->handle = handle;
@@ -1537,7 +1537,7 @@ PyInit__winapi(void)
     PyObject *d;
     PyObject *m;
 
-    if (PyType_Ready(&OverlappedType) < 0)
+    if (PyType_Ready(&WinApiOverlappedType) < 0)
         return NULL;
 
     m = PyModule_Create(&winapi_module);
@@ -1545,7 +1545,7 @@ PyInit__winapi(void)
         return NULL;
     d = PyModule_GetDict(m);
 
-    PyDict_SetItemString(d, "Overlapped", (PyObject *) &OverlappedType);
+    PyDict_SetItemString(d, "Overlapped", (PyObject *) &WinApiOverlappedType);
 
     /* constants */
     WINAPI_CONSTANT(F_DWORD, CREATE_NEW_CONSOLE);