diff --git a/racket/src/ChezScheme/c/Mf-a6osx b/racket/src/ChezScheme/c/Mf-a6osx
index 247d52d2d3..7cadd7127c 100644
--- a/racket/src/ChezScheme/c/Mf-a6osx
+++ b/racket/src/ChezScheme/c/Mf-a6osx
@@ -16,7 +16,6 @@
 m ?= a6osx
 Cpu ?= X86_64
 
-mdinclude = -I/opt/X11/include/ 
 o = o
 mdsrc ?= i3le.c
 mdobj ?= i3le.o
diff --git a/racket/src/ChezScheme/c/Mf-arm64osx b/racket/src/ChezScheme/c/Mf-arm64osx
index 24cdd423f2..57cd07051a 100644
--- a/racket/src/ChezScheme/c/Mf-arm64osx
+++ b/racket/src/ChezScheme/c/Mf-arm64osx
@@ -16,7 +16,6 @@
 m ?= arm64osx
 Cpu ?= AARCH64
 
-mdinclude = -I/opt/X11/include/
 o = o
 mdsrc ?= arm32le.c
 mdobj ?= arm32le.o
diff --git a/racket/src/ChezScheme/c/Mf-i3osx b/racket/src/ChezScheme/c/Mf-i3osx
index 710e9ec515..91dc1ecb6d 100644
--- a/racket/src/ChezScheme/c/Mf-i3osx
+++ b/racket/src/ChezScheme/c/Mf-i3osx
@@ -16,7 +16,6 @@
 m ?= i3osx
 Cpu ?= I386
 
-mdinclude = -I/opt/X11/include/ 
 o = o
 mdsrc ?= i3le.c
 mdobj ?= i3le.o
diff --git a/racket/src/ChezScheme/c/version.h b/racket/src/ChezScheme/c/version.h
index c50c942f66..7adcbed8b0 100644
--- a/racket/src/ChezScheme/c/version.h
+++ b/racket/src/ChezScheme/c/version.h
@@ -352,7 +352,10 @@ typedef int tputsputcchar;
 #define LOCKF
 #define DIRMARKERP(c) ((c) == '/')
 #ifndef DISABLE_X11
-#define LIBX11 "/usr/X11R6/lib/libX11.dylib"
+# define DISABLE_X11
+#endif
+#ifndef DISABLE_X11
+# define LIBX11 "/usr/X11R6/lib/libX11.dylib"
 #endif
 #define _DARWIN_USE_64_BIT_INODE
 #define SECATIME(sb) (sb).st_atimespec.tv_sec
diff --git a/racket/src/ChezScheme/configure b/racket/src/ChezScheme/configure
index 81864a5008..23f5804fc2 100755
--- a/racket/src/ChezScheme/configure
+++ b/racket/src/ChezScheme/configure
@@ -407,14 +407,6 @@ if [ "$installman" = "" ] ; then
   installman=$installprefix/$installmansuffix
 fi
 
-if [ "$disablex11" = "no" ] ; then
-  if [ $m = a6osx ] || [ $m = ta6osx ] ; then
-    if [ ! -d /opt/X11/include/ ] ; then
-      disablex11=yes
-    fi
-  fi
-fi
-
 if [ "$help" = "yes" ]; then
   echo "Purpose:"
   echo "  $0 determines the machine type and constructs a custom Makefile"