diff --git a/Include/pyport.h b/Include/pyport.h
index eb1bbe20ec6..4b9c238b9f3 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -406,6 +406,14 @@ typedef size_t Py_uhash_t;
 #define S_ISDIR(x) (((x) & S_IFMT) == S_IFDIR)
 #endif
 
+#ifndef S_ISCHR
+#define S_ISCHR(x) (((x) & S_IFMT) == S_IFCHR)
+#endif
+
+#ifndef S_ISBLK
+#define S_ISBLK(x) (((x) & S_IFMT) == S_IFBLK)
+#endif
+
 
 #ifdef __cplusplus
 /* Move this down here since some C++ #include's don't like to be included
diff --git a/Modules/_stat.c b/Modules/_stat.c
index 41a5a09d713..aaf6fe5ca29 100644
--- a/Modules/_stat.c
+++ b/Modules/_stat.c
@@ -26,6 +26,10 @@ extern "C" {
 #include <sys/stat.h>
 #endif /* HAVE_SYS_STAT_H */
 
+#ifdef MS_WINDOWS
+typedef unsigned short mode_t;
+#endif
+
 /* From Python's stat.py */
 #ifndef S_IMODE
 #  define S_IMODE 07777