--- pTk/mTk/xlib/X11/Xlib.h.xlib	2011-01-01 10:55:22.000000000 +0000
+++ pTk/mTk/xlib/X11/Xlib.h	2011-01-01 10:55:22.000000000 +0000
@@ -22,8 +22,8 @@
  *	interface library (Xlib) to the X Window System Protocol (V11).
  *	Structures and symbols starting with "_" are private to the library.
  */
-#ifndef _XLIB_H_
-#define _XLIB_H_
+#ifndef _X11_XLIB_H_
+#define _X11_XLIB_H_
 
 #define XlibSpecificationRelease 5
 
@@ -1211,4 +1211,4 @@
 #   undef Cursor
 #endif
 
-#endif /* _XLIB_H_ */
+#endif /* _X11_XLIB_H_ */
--- pTk/tkVMacro.h.xlib	2011-01-01 10:55:22.000000000 +0000
+++ pTk/tkVMacro.h	2011-01-01 10:55:22.000000000 +0000
@@ -6,8 +6,8 @@
 #include "tk.m"
 #endif
 
-#if defined(_TK) || defined(_XLIB_H_)
-# if !defined(_XLIB) && !defined(_XLIB_H_)
+#if defined(_TK) || defined(_X11_XLIB_H_)
+# if !defined(_XLIB) && !defined(_X11_XLIB_H_)
 #  include <X11/Xlib.h>
 # endif
 # ifdef _TKINTXLIBDECLS