diff --git a/libImaging/ImDib.h b/libImaging/ImDib.h
index 2effd3870..23c660488 100644
--- a/libImaging/ImDib.h
+++ b/libImaging/ImDib.h
@@ -14,6 +14,10 @@
 
 #if (defined(_MSC_VER) && _MSC_VER >= 1200) || (defined __GNUC__)
 /* already defined in basetsd.h */
+#undef INT8
+#undef UINT8
+#undef INT16
+#undef UINT16
 #undef INT32
 #undef INT64
 #undef UINT32
diff --git a/map.c b/map.c
index f15b8200f..beba8a242 100644
--- a/map.c
+++ b/map.c
@@ -29,6 +29,10 @@
 
 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN
+#undef INT8
+#undef UINT8
+#undef INT16
+#undef UINT16
 #undef INT32
 #undef INT64
 #undef UINT32