diff --git a/Xlib/X/X.xs b/Xlib/X/X.xs
index b04418d2..e324c49d 100644
--- a/Xlib/X/X.xs
+++ b/Xlib/X/X.xs
@@ -614,11 +614,7 @@ int arg;
 	    goto not_there;
 #endif
 	if (strEQ(name, "ControlMask"))
-#ifdef ControlMask
 	    return ControlMask;
-#else
-	    goto not_there;
-#endif
 	if (strEQ(name, "Convex"))
 #ifdef Convex
 	    return Convex;
@@ -1572,11 +1568,7 @@ int arg;
 	    goto not_there;
 #endif
 	if (strEQ(name, "None"))
-#ifdef None
 	    return None;
-#else
-	    goto not_there;
-#endif
 	if (strEQ(name, "NorthEastGravity"))
 #ifdef NorthEastGravity
 	    return NorthEastGravity;
diff --git a/pTk/mTk/xlib/X11/X.h b/pTk/mTk/xlib/X11/X.h
index a1cf10c8..e40ec07e 100644
--- a/pTk/mTk/xlib/X11/X.h
+++ b/pTk/mTk/xlib/X11/X.h
@@ -73,7 +73,9 @@ typedef unsigned long KeyCode;	/* In order to use IME, the Macintosh needs
  * RESERVED RESOURCE AND CONSTANT DEFINITIONS
  *****************************************************************/
 
-#define None                 0L	/* universal null resource or null atom */
+#ifndef _WIN32
+#   define None              0L      /* See bug [9e31fd9449] and below */
+#endif
 
 #define ParentRelative       1L	/* background pixmap in CreateWindow
 				    and ChangeWindowAttributes */
@@ -179,13 +181,20 @@ are reserved in the protocol for errors and replies. */
 
 #define ShiftMask		(1<<0)
 #define LockMask		(1<<1)
-#define ControlMask		(1<<2)
+#ifndef _WIN32
+#   define ControlMask		(1<<2) /* See bug [9e31fd9449] and below */
+#endif
 #define Mod1Mask		(1<<3)
 #define Mod2Mask		(1<<4)
 #define Mod3Mask		(1<<5)
 #define Mod4Mask		(1<<6)
 #define Mod5Mask		(1<<7)
 
+/* See bug [9e31fd9449], this way prevents conflicts with Win32 headers */
+#ifdef _WIN32
+enum { None = 0, ControlMask = (1<<2) };
+#endif
+
 /* modifier names.  Used to build a SetModifierMapping request or
    to read a GetModifierMapping request.  These correspond to the
    masks defined above. */