3 files changed, 14 insertions, 7 deletions
diff --git a/xlib/X11/X.h b/xlib/X11/X.h
index 8b37559..7755cac 100644
--- a/xlib/X11/X.h
+++ b/xlib/X11/X.h
@@ -33,7 +33,7 @@ SOFTWARE.
 #define X_PROTOCOL	11		/* current protocol version */
 #define X_PROTOCOL_REVISION 0		/* current minor version */
 
-#ifdef MAC_TCL
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 #   define Cursor XCursor
 #   define Region XRegion
 #endif
@@ -669,7 +669,7 @@ are reserved in the protocol for errors and replies. */
 #define LSBFirst		0
 #define MSBFirst		1
 
-#ifdef MAC_TCL
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 #   undef Cursor
 #   undef Region
 #endif
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h
index e8723dd..252b11d 100644
--- a/xlib/X11/Xlib.h
+++ b/xlib/X11/Xlib.h
@@ -27,12 +27,18 @@
 
 #define XlibSpecificationRelease 5
 
+#if !defined(MAC_TCL) && !defined(MAC_OSX_TK)
+#   include <X11/X.h>
+#endif
 #ifdef MAC_TCL
 #   include <X.h>
 #   define Cursor XCursor
 #   define Region XRegion
-#else
+#endif
+#ifdef MAC_OSX_TK
 #   include <X11/X.h>
+#   define Cursor XCursor
+#   define Region XRegion
 #endif
 
 /* applications should not depend on these two headers being included! */
@@ -58,7 +64,8 @@ typedef unsigned long wchar_t;
 typedef char *XPointer;
 
 #define Bool int
-#ifdef MAC_TCL
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
+/* Use define rather than typedef, since may need to undefine this later */
 #define Status int
 #else
 typedef int Status;
@@ -1199,7 +1206,7 @@ _XFUNCPROTOBEGIN
 
 _XFUNCPROTOEND
 
-#ifdef MAC_TCL
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 #   undef Cursor
 #   undef Region
 #endif
diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h
index f6c0a36..8812c80 100644
--- a/xlib/X11/Xutil.h
+++ b/xlib/X11/Xutil.h
@@ -29,7 +29,7 @@ SOFTWARE.
 
 /* You must include <X11/Xlib.h> before including this file */
 
-#ifdef MAC_TCL
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 #   define Region XRegion
 #endif
 
@@ -848,7 +848,7 @@ extern void XXorRegion(
 
 _XFUNCPROTOEND
 
-#ifdef MAC_TCL
+#if defined(MAC_TCL) || defined(MAC_OSX_TK)
 #   undef Region
 #endif