diff --git a/src/keyevent.c b/src/keyevent.c
index c7738ff..b1f9df5 100644
--- a/src/keyevent.c
+++ b/src/keyevent.c
@@ -58,7 +58,9 @@ void Mouse_hndlr(void); /* Fields mouse events from driver        */
 
 #include "keyeventdefs.h"
 #include "osmsgdefs.h"
+#ifdef XWINDOW
 #include "xwinmandefs.h"
+#endif
 
 #ifdef MAIKO_ENABLE_ETHERNET
 #include "etherdefs.h"
diff --git a/src/xc.c b/src/xc.c
index 3e802b2..ea2dbbe 100644
--- a/src/xc.c
+++ b/src/xc.c
@@ -99,7 +99,9 @@
 #include "ubf3defs.h"
 #include "unwinddefs.h"
 #include "vars3defs.h"
+#ifdef XWINDOW
 #include "xwinmandefs.h"
+#endif
 #include "z2defs.h"
 
 #ifdef DOS
@@ -109,7 +111,7 @@ extern IOPAGE *IOPage68K;
 extern KbdInterface currentkbd;
 extern DspInterface currentdsp;
 extern MouseInterface currentmouse;
-#else
+#elif defined(XWINDOW)
 extern DspInterface currentdsp;
 #endif /* DOS */