diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bee69f..5e794fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,6 @@ SET(MAIKO_DEFINITIONS
 IF(TRUE)
   # Turn this into a config option.
   LIST(APPEND MAIKO_DEFINITIONS
-    "-DNOPIXRECT"
     "-DXWINDOW"
   )
 ENDIF()
diff --git a/bin/makefile-cygwin.x86_64-x b/bin/makefile-cygwin.x86_64-x
index de376c2..7dc2b8b 100644
--- a/bin/makefile-cygwin.x86_64-x
+++ b/bin/makefile-cygwin.x86_64-x
@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -DXWINDOW -DNOPIXRECT
+XFLAGS = -DXWINDOW
 
 # This is to make the %$#@! Apollo cc happy
 OEXT = .o
diff --git a/bin/makefile-darwin.386-x b/bin/makefile-darwin.386-x
index 3dcee81..636086c 100644
--- a/bin/makefile-darwin.386-x
+++ b/bin/makefile-darwin.386-x
@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT
+XFLAGS = -I/opt/X11/include -DXWINDOW
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O2 -g
diff --git a/bin/makefile-darwin.aarch64-x b/bin/makefile-darwin.aarch64-x
index 5d4e936..edecd7e 100644
--- a/bin/makefile-darwin.aarch64-x
+++ b/bin/makefile-darwin.aarch64-x
@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -I/opt/local/include -DXWINDOW -DNOPIXRECT
+XFLAGS = -I/opt/local/include -DXWINDOW
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O1 -g
diff --git a/bin/makefile-darwin.x86_64-x b/bin/makefile-darwin.x86_64-x
index 429eede..e011f85 100644
--- a/bin/makefile-darwin.x86_64-x
+++ b/bin/makefile-darwin.x86_64-x
@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT
+XFLAGS = -I/opt/X11/include -DXWINDOW
 
 # OPTFLAGS is normally -O2.
 OPTFLAGS =  -O1 -g
diff --git a/bin/makefile-freebsd.386-x b/bin/makefile-freebsd.386-x
index ec340b0..7d02692 100644
--- a/bin/makefile-freebsd.386-x
+++ b/bin/makefile-freebsd.386-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -I/usr/local/include -DXWINDOW -DNOPIXRECT
+XFLAGS = -I/usr/local/include -DXWINDOW
 
 # This is to make the %$#@! Apollo cc happy
 OEXT = .o
diff --git a/bin/makefile-init.386 b/bin/makefile-init.386
index 04b1098..4ad712a 100644
--- a/bin/makefile-init.386
+++ b/bin/makefile-init.386
@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -I/opt/X11/include -DXWINDOW -DNOPIXRECT
+XFLAGS = -I/opt/X11/include -DXWINDOW
 
 # OPTFLAGS is normally -O2, for INIT we want unoptimized in case we need to debug it
 OPTFLAGS =  -O0 -g
diff --git a/bin/makefile-init.sparc b/bin/makefile-init.sparc
index 773968f..949d575 100644
--- a/bin/makefile-init.sparc
+++ b/bin/makefile-init.sparc
@@ -45,7 +45,7 @@ OPTFLAGS = -g3 -O
 
 DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 
-MACHINEFLAGS = -DOS5 -DAIX -DUSE_DLPI -DNOPIXRECT \
+MACHINEFLAGS = -DOS5 -DAIX -DUSE_DLPI \
 		-I$(OPENWINHOME)/include \
 		-DLOGINT -DLOCK_X_UPDATES
 
diff --git a/bin/makefile-linux.386-x b/bin/makefile-linux.386-x
index 98e5c0b..0485110 100644
--- a/bin/makefile-linux.386-x
+++ b/bin/makefile-linux.386-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -DXWINDOW -DNOPIXRECT
+XFLAGS = -DXWINDOW
 
 # This is to make the %$#@! Apollo cc happy
 OEXT = .o
diff --git a/bin/makefile-linux.armv7l-x b/bin/makefile-linux.armv7l-x
index 9864584..ea71cd9 100644
--- a/bin/makefile-linux.armv7l-x
+++ b/bin/makefile-linux.armv7l-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o
 
-XFLAGS = -DXWINDOW -DNOPIXRECT
+XFLAGS = -DXWINDOW
 
 # This is to make the %$#@! Apollo cc happy
 OEXT = .o
diff --git a/bin/makefile-linux.x86_64-x b/bin/makefile-linux.x86_64-x
index de376c2..7dc2b8b 100644
--- a/bin/makefile-linux.x86_64-x
+++ b/bin/makefile-linux.x86_64-x
@@ -14,7 +14,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -DXWINDOW -DNOPIXRECT
+XFLAGS = -DXWINDOW
 
 # This is to make the %$#@! Apollo cc happy
 OEXT = .o
diff --git a/bin/makefile-openbsd.x86_64-x b/bin/makefile-openbsd.x86_64-x
index 758d8bf..fc80f02 100644
--- a/bin/makefile-openbsd.x86_64-x
+++ b/bin/makefile-openbsd.x86_64-x
@@ -13,7 +13,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xwinman.o
 
 
-XFLAGS = -I/usr/X11R6/include -DXWINDOW -DNOPIXRECT
+XFLAGS = -I/usr/X11R6/include -DXWINDOW
 
 # This is to make the %$#@! Apollo cc happy
 OEXT = .o
diff --git a/bin/makefile-sunos5.386-x b/bin/makefile-sunos5.386-x
index 8afecb6..44e0eb3 100644
--- a/bin/makefile-sunos5.386-x
+++ b/bin/makefile-sunos5.386-x
@@ -22,7 +22,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o
 
-XFLAGS = -DXWINDOW -DNOPIXRECT
+XFLAGS = -DXWINDOW
 
 # This is to make the %$#@! Apollo cc happy
 OEXT = .o
@@ -38,7 +38,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \
 	-DOS5 -DBYTESWAP -DLOGINT \
-	-DNOPIXRECT -DLOCK_X_UPDATES   \
+	-DLOCK_X_UPDATES   \
 	-DRELEASE=351
 
 LDFLAGS = -L/usr/X11/lib -lX11 -lc -lm -lsocket -lnsl
diff --git a/bin/makefile-sunos5.i386-x b/bin/makefile-sunos5.i386-x
index 4b93c09..2d605d5 100644
--- a/bin/makefile-sunos5.i386-x
+++ b/bin/makefile-sunos5.i386-x
@@ -39,7 +39,7 @@ DFLAGS = $(XFLAGS) \
 	$(DEBUGFLAGS) \
 	-DOS5 -DAIX -DUSE_DLPI \
 	-DBYTESWAP -DLOGINT \
-	-DNOPIXRECT -DLOCK_X_UPDATES   \
+	-DLOCK_X_UPDATES   \
 	-I$(OPENWINHOME)/include \
 	-DRELEASE=210
 
diff --git a/bin/makefile-sunos5.sparc-x b/bin/makefile-sunos5.sparc-x
index 3357779..fc88441 100644
--- a/bin/makefile-sunos5.sparc-x
+++ b/bin/makefile-sunos5.sparc-x
@@ -42,8 +42,7 @@ OPTFLAGS =  -O2 -g3
 
 DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 
-MACHINEFLAGS = -DOS5 -DUSE_DLPI -DNOPIXRECT \
-		-DLOGINT -DLOCK_X_UPDATES
+MACHINEFLAGS = -DOS5 -DUSE_DLPI -DLOGINT -DLOCK_X_UPDATES
 
 DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \
diff --git a/bin/makefile-sunos5.x86_64-x b/bin/makefile-sunos5.x86_64-x
index f1c8e54..d8fd63a 100644
--- a/bin/makefile-sunos5.x86_64-x
+++ b/bin/makefile-sunos5.x86_64-x
@@ -22,7 +22,7 @@ XFILES = $(OBJECTDIR)xmkicon.o \
 	$(OBJECTDIR)xrdopt.o \
 	$(OBJECTDIR)xwinman.o
 
-XFLAGS = -DXWINDOW -DNOPIXRECT
+XFLAGS = -DXWINDOW
 
 # This is to make the %$#@! Apollo cc happy
 OEXT = .o
@@ -38,7 +38,7 @@ DEBUGFLAGS = # -DSTACKCHECK -DFNSTKCHECK
 DFLAGS = $(XFLAGS) \
 	 $(DEBUGFLAGS) \
 	-DOS5 -DBYTESWAP -DLOGINT \
-	-DNOPIXRECT -DLOCK_X_UPDATES   \
+	-DLOCK_X_UPDATES   \
 	-DUSE_DLPI \
 	-DRELEASE=351