diff --git a/src/common.c b/src/common.c
index d2e7a26..4322338 100644
--- a/src/common.c
+++ b/src/common.c
@@ -28,10 +28,6 @@
 #include "kprintdefs.h"
 #include "uraiddefs.h"
 
-#ifndef NOPIXRECT
-#include <pixrect/pixrect_hs.h>
-#endif
-
 void stab() { DBPRINT(("Now in stab\n")); }
 
 /***************************************************************
diff --git a/src/draw.c b/src/draw.c
index abbdf1a..73f81f7 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 
-#ifndef NOPIXRECT
+#ifdef SUNDISPLAY
 #include <sys/ioctl.h>
 #include <sunwindow/window_hs.h>
 #include <sunwindow/win_ioctl.h>
diff --git a/src/dspsubrs.c b/src/dspsubrs.c
index ec684b5..610797a 100644
--- a/src/dspsubrs.c
+++ b/src/dspsubrs.c
@@ -12,10 +12,9 @@
 #include "version.h"
 
 #include <stdio.h>
-#ifndef NOPIXRECT
+#ifdef SUNDISPLAY
 #include <sunwindow/window_hs.h>
-#include <pixrect/memvar.h>
-#endif /* NOPIXRECT */
+#endif
 
 #include "lispemul.h"
 #include "lsptypes.h"
diff --git a/src/misc7.c b/src/misc7.c
index 6c1c86f..fcaf349 100644
--- a/src/misc7.c
+++ b/src/misc7.c
@@ -32,7 +32,7 @@
 #include "bbtsubdefs.h"
 #include "initdspdefs.h"
 
-#ifndef NOPIXRECT
+#ifdef SUNDISPLAY
 #include <sunwindow/window_hs.h>
 #include <sunwindow/win_ioctl.h>