From 30c9b8f39db4e5f6f822a9cc2d7828041673bc85 Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Mon, 21 Dec 2020 22:13:41 +0700
Subject: [PATCH] X*.h headers weren't cleaned up after renaming and merging.

* Check.h, Stipple.h, XCursors.h, XWaitCur.h, Xcursdef.h,
  Xdefcur.h, and Xicon.h were combined into xbitmaps.h.
* Xdisplay.h is not used and the contents are in MyWindow.h, which
  is used.
* XVersion.h and Xdeflt.h became xdefs.h. Remove 2 stragglers
  that were still including XVersion.h.
---
 bin/makefile-tail |  66 ++++++------
 inc/Check.h       |  59 -----------
 inc/Stipple.h     |  41 --------
 inc/XCursors.h    | 255 ----------------------------------------------
 inc/XVersion.h    |  55 ----------
 inc/XWaitCur.h    |  38 -------
 inc/Xcursdef.h    |  38 -------
 inc/Xdefcur.h     |  39 -------
 inc/Xdeflt.h      |  30 ------
 inc/Xdisplay.h    |  50 ---------
 inc/Xicon.h       |  76 --------------
 src/ldeboot.c     |   1 -
 src/mnwevent.c    |   1 -
 13 files changed, 32 insertions(+), 717 deletions(-)
 delete mode 100755 inc/Check.h
 delete mode 100755 inc/Stipple.h
 delete mode 100755 inc/XCursors.h
 delete mode 100755 inc/XVersion.h
 delete mode 100755 inc/XWaitCur.h
 delete mode 100755 inc/Xcursdef.h
 delete mode 100755 inc/Xdefcur.h
 delete mode 100755 inc/Xdeflt.h
 delete mode 100755 inc/Xdisplay.h
 delete mode 100755 inc/Xicon.h

diff --git a/bin/makefile-tail b/bin/makefile-tail
index 9c76da54..26fe2355 100755
--- a/bin/makefile-tail
+++ b/bin/makefile-tail
@@ -824,15 +824,15 @@ $(OBJECTDIR)xinit.o : $(SRCDIR)xinit.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h \
 	$(INCDIR)adr68k.h
 	$(CC) $(RFLAGS) $(SRCDIR)xinit.c -o $(OBJECTDIR)xinit$(OEXT)
 
-$(OBJECTDIR)XClose.o : $(SRCDIR)XClose.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)XClose.o : $(SRCDIR)XClose.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h 
 	$(CC) $(RFLAGS) $(SRCDIR)XClose.c -o $(OBJECTDIR)XClose$(OEXT)
 
-$(OBJECTDIR)Cursor.o : $(SRCDIR)Cursor.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h $(INCDIR)MyWindow.h \
+$(OBJECTDIR)Cursor.o : $(SRCDIR)Cursor.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h $(INCDIR)MyWindow.h \
 	$(INCDIR)lispemul.h $(INCDIR)display.h 
 	$(CC) $(RFLAGS) $(SRCDIR)Cursor.c -o $(OBJECTDIR)Cursor$(OEXT)
 
-$(OBJECTDIR)XWindow.o : $(SRCDIR)XWindow.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)XWindow.o : $(SRCDIR)XWindow.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h $(INCDIR)lispemul.h $(INCDIR)address.h \
 	$(INCDIR)adr68k.h 
 	$(CC) $(RFLAGS) $(SRCDIR)XWindow.c -o $(OBJECTDIR)XWindow$(OEXT)
@@ -840,64 +840,64 @@ $(OBJECTDIR)XWindow.o : $(SRCDIR)XWindow.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h
 $(OBJECTDIR)DoRing.o : $(SRCDIR)DoRing.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h
 	$(CC) $(RFLAGS) $(SRCDIR)DoRing.c -o $(OBJECTDIR)DoRing$(OEXT)
 
-$(OBJECTDIR)DoScroll.o : $(SRCDIR)DoScroll.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)DoScroll.o : $(SRCDIR)DoScroll.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h $(INCDIR)Xbitblt.h
 	$(CC) $(RFLAGS) $(SRCDIR)DoScroll.c -o $(OBJECTDIR)DoScroll$(OEXT)
 
-$(OBJECTDIR)XEvent.o : $(SRCDIR)XEvent.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)XEvent.o : $(SRCDIR)XEvent.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h $(INCDIR)Xbitblt.h
 	$(CC) $(RFLAGS) $(SRCDIR)XEvent.c -o $(OBJECTDIR)XEvent$(OEXT)
 
-$(OBJECTDIR)XGravity.o : $(SRCDIR)XGravity.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)XGravity.o : $(SRCDIR)XGravity.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h
 	$(CC) $(RFLAGS) $(SRCDIR)XGravity.c -o $(OBJECTDIR)XGravity$(OEXT)
 
 $(OBJECTDIR)XInit.o : $(SRCDIR)XInit.c $(REQUIRED-INCS) 
 	$(CC) $(RFLAGS) $(SRCDIR)XInit.c -o $(OBJECTDIR)XInit$(OEXT)
 
-$(OBJECTDIR)Xevinit.o : $(SRCDIR)Xevinit.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)Xevinit.o : $(SRCDIR)Xevinit.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h
 	$(CC) $(RFLAGS) $(SRCDIR)Xevinit.c -o $(OBJECTDIR)Xevinit$(OEXT)
 
 $(OBJECTDIR)Xkbdmus.o : $(SRCDIR)Xkbdmus.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h \
-	$(INCDIR)XVersion.h $(INCDIR)MyWindow.h $(INCDIR)dbprint.h
+	$(INCDIR)xdefs.h $(INCDIR)MyWindow.h $(INCDIR)dbprint.h
 	$(CC) $(RFLAGS) $(SRCDIR)Xkbdmus.c -o $(OBJECTDIR)Xkbdmus$(OEXT)
 
-$(OBJECTDIR)Xlspwin.o : $(SRCDIR)Xlspwin.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)Xlspwin.o : $(SRCDIR)Xlspwin.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h $(INCDIR)Xdeflt.h
 	$(CC) $(RFLAGS) $(SRCDIR)Xlspwin.c -o $(OBJECTDIR)Xlspwin$(OEXT)
 
-$(OBJECTDIR)xlspwin.o : $(SRCDIR)xlspwin.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)xlspwin.o : $(SRCDIR)xlspwin.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h $(INCDIR)xdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)xlspwin.c -o $(OBJECTDIR)xlspwin$(OEXT)
 
-$(OBJECTDIR)Xbbt.o : $(SRCDIR)Xbbt.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)Xbbt.o : $(SRCDIR)Xbbt.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h
 	$(CC) $(RFLAGS) $(SRCDIR)Xbbt.c -o $(OBJECTDIR)Xbbt$(OEXT)
 
-$(OBJECTDIR)xbbt.o : $(SRCDIR)xbbt.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)xbbt.o : $(SRCDIR)xbbt.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h
 	$(CC) $(RFLAGS) $(SRCDIR)xbbt.c -o $(OBJECTDIR)xbbt$(OEXT)
 
 $(OBJECTDIR)LispXdisplay.o : $(SRCDIR)LispXdisplay.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h \
 	$(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)pilotbbt.h \
-	$(INCDIR)XVersion.h $(INCDIR)MyWindow.h $(INCDIR)Xbitblt.h
+	$(INCDIR)xdefs.h $(INCDIR)MyWindow.h $(INCDIR)Xbitblt.h
 	$(CC) $(RFLAGS) $(SRCDIR)LispXdisplay.c -o $(OBJECTDIR)LispXdisplay$(OEXT)
 
-$(OBJECTDIR)Xkbd.o : $(SRCDIR)Xkbd.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)Xkbd.o : $(SRCDIR)Xkbd.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h
 	$(CC) $(RFLAGS) $(SRCDIR)Xkbd.c -o $(OBJECTDIR)Xkbd$(OEXT)
 
-$(OBJECTDIR)Xmkicon.o : $(SRCDIR)Xmkicon.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
-	$(INCDIR)MyWindow.h $(INCDIR)Xicon.h
+$(OBJECTDIR)Xmkicon.o : $(SRCDIR)Xmkicon.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
+	$(INCDIR)MyWindow.h $(INCDIR)xbitmaps.h
 	$(CC) $(RFLAGS) $(SRCDIR)Xmkicon.c -o $(OBJECTDIR)Xmkicon$(OEXT)
 
-$(OBJECTDIR)xmkicon.o : $(SRCDIR)xmkicon.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
-	$(INCDIR)MyWindow.h $(INCDIR)Xicon.h
+$(OBJECTDIR)xmkicon.o : $(SRCDIR)xmkicon.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
+	$(INCDIR)MyWindow.h $(INCDIR)xbitmaps.h
 	$(CC) $(RFLAGS) $(SRCDIR)xmkicon.c -o $(OBJECTDIR)xmkicon$(OEXT)
 
 $(OBJECTDIR)Xopendsp.o : $(SRCDIR)Xopendsp.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h \
-	$(INCDIR)XVersion.h $(INCDIR)MyWindow.h
+	$(INCDIR)xdefs.h $(INCDIR)MyWindow.h
 	$(CC) $(RFLAGS) $(SRCDIR)Xopendsp.c -o $(OBJECTDIR)Xopendsp$(OEXT)
 
 $(OBJECTDIR)Xrdopt.o : $(SRCDIR)Xrdopt.c  $(REQUIRED-INCS) $(INCDIR)Xdeflt.h
@@ -907,48 +907,46 @@ $(OBJECTDIR)xrdopt.o : $(SRCDIR)xrdopt.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)xrdopt.c -o $(OBJECTDIR)xrdopt$(OEXT)
 
 $(OBJECTDIR)Xreconf.o : $(SRCDIR)Xreconf.c  $(REQUIRED-INCS) \
-	$(INCDIR)XVersion.h $(INCDIR)MyWindow.h
+	$(INCDIR)xdefs.h $(INCDIR)MyWindow.h
 	$(CC) $(RFLAGS) $(SRCDIR)Xreconf.c -o $(OBJECTDIR)Xreconf$(OEXT)
 
-$(OBJECTDIR)XScroll.o : $(SRCDIR)XScroll.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
-	$(INCDIR)MyWindow.h $(INCDIR)Stipple.h $(INCDIR)Xcursdef.h \
-	$(INCDIR)XCursors.h
+$(OBJECTDIR)XScroll.o : $(SRCDIR)XScroll.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
+	$(INCDIR)MyWindow.h $(INCDIR)xbitmaps.h
 	$(CC) $(RFLAGS) $(SRCDIR)XScroll.c -o $(OBJECTDIR)XScroll$(OEXT)
 
-$(OBJECTDIR)xscroll.o : $(SRCDIR)xscroll.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
-	$(INCDIR)MyWindow.h $(INCDIR)Stipple.h $(INCDIR)Xcursdef.h \
-	$(INCDIR)XCursors.h
+$(OBJECTDIR)xscroll.o : $(SRCDIR)xscroll.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
+	$(INCDIR)MyWindow.h $(INCDIR)xbitmaps.h
 	$(CC) $(RFLAGS) $(SRCDIR)xscroll.c -o $(OBJECTDIR)xscroll$(OEXT)
 
-$(OBJECTDIR)Xscrolb.o : $(SRCDIR)Xscrolb.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)Xscrolb.o : $(SRCDIR)Xscrolb.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h
 	$(CC) $(RFLAGS) $(SRCDIR)Xscrolb.c -o $(OBJECTDIR)Xscrolb$(OEXT)
 
 $(OBJECTDIR)XCursor.o : $(SRCDIR)XCursor.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h \
-	$(INCDIR)iopage.h $(INCDIR)XVersion.h $(INCDIR)MyWindow.h
+	$(INCDIR)iopage.h $(INCDIR)xdefs.h $(INCDIR)MyWindow.h
 	$(CC) $(RFLAGS) $(SRCDIR)XCursor.c -o $(OBJECTDIR)XCursor$(OEXT)
 
 $(OBJECTDIR)xcursor.o : $(SRCDIR)xcursor.c  $(REQUIRED-INCS) $(INCDIR)lispemul.h \
-	$(INCDIR)iopage.h $(INCDIR)XVersion.h $(INCDIR)MyWindow.h
+	$(INCDIR)iopage.h $(INCDIR)xdefs.h $(INCDIR)MyWindow.h
 	$(CC) $(RFLAGS) $(SRCDIR)xcursor.c -o $(OBJECTDIR)xcursor$(OEXT)
 
 $(OBJECTDIR)XMouse.o : $(SRCDIR)XMouse.c  $(REQUIRED-INCS) \
-	$(INCDIR)XVersion.h $(INCDIR)MyWindow.h 
+	$(INCDIR)xdefs.h $(INCDIR)MyWindow.h 
 	$(CC) $(RFLAGS) $(SRCDIR)XMouse.c -o $(OBJECTDIR)XMouse$(OEXT)
 
-$(OBJECTDIR)Xsubwin.o : $(SRCDIR)Xsubwin.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)Xsubwin.o : $(SRCDIR)Xsubwin.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h
 	$(CC) $(RFLAGS) $(SRCDIR)Xsubwin.c -o $(OBJECTDIR)Xsubwin$(OEXT)
 
-$(OBJECTDIR)Xcolor.o : $(SRCDIR)Xcolor.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)Xcolor.o : $(SRCDIR)Xcolor.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h
 	$(CC) $(RFLAGS) $(SRCDIR)Xcolor.c -o $(OBJECTDIR)Xcolor$(OEXT)
 
-$(OBJECTDIR)Xwinman.o : $(SRCDIR)Xwinman.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)Xwinman.o : $(SRCDIR)Xwinman.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h $(INCDIR)dbprint.h
 	$(CC) $(RFLAGS) $(SRCDIR)Xwinman.c -o $(OBJECTDIR)Xwinman$(OEXT)
 
-$(OBJECTDIR)xwinman.o : $(SRCDIR)xwinman.c  $(REQUIRED-INCS) $(INCDIR)XVersion.h \
+$(OBJECTDIR)xwinman.o : $(SRCDIR)xwinman.c  $(REQUIRED-INCS) $(INCDIR)xdefs.h \
 	$(INCDIR)MyWindow.h $(INCDIR)dbprint.h
 	$(CC) $(RFLAGS) $(SRCDIR)xwinman.c -o $(OBJECTDIR)xwinman$(OEXT)
 
diff --git a/inc/Check.h b/inc/Check.h
deleted file mode 100755
index 0ae53258..00000000
--- a/inc/Check.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $Id: Check.h,v 1.2 1999/01/03 02:05:47 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-
-
-/************************************************************************/
-/*									*/
-/*				C h e c k . h				*/
-/*									*/
-/*									*/
-/*									*/
-/************************************************************************/
-
-
-
-
-/************************************************************************/
-/*									*/
-/*	(C) Copyright 1989-92 Venue. All Rights Reserved.		*/
-/*	Manufactured in the United States of America.			*/
-/*									*/
-/************************************************************************/
-
-
-#define check_width  16
-#define check_height 16
-static char check_bits[] = 
-  { 0xAA, 0xAA
-  , 0x55, 0x55
-  , 0xAA, 0xAA
-  , 0x55, 0x55
-  , 0xAA, 0xAA
-  , 0x55, 0x55
-  , 0xAA, 0xAA
-  , 0x55, 0x55
-  , 0xAA, 0xAA
-  , 0x55, 0x55
-  , 0xAA, 0xAA
-  , 0x55, 0x55
-  , 0xAA, 0xAA
-  , 0x55, 0x55
-  , 0xAA, 0xAA
-  , 0x55, 0x55 };
-
-static char plain_bits[] =
-  { 0x00, 0x00
-  , 0x00, 0x00			 
-  , 0x00, 0x00			 
-  , 0x00, 0x00			 
-  , 0x00, 0x00			 
-  , 0x00, 0x00			 
-  , 0x00, 0x00			 
-  , 0x00, 0x00			 
-  , 0x00, 0x00			 
-  , 0x00, 0x00			 
-  , 0x00, 0x00			 
-  , 0x00, 0x00			 
-  , 0x00, 0x00			 
-  , 0x00, 0x00			 
-  , 0x00, 0x00			 
-  , 0x00, 0x00 };
diff --git a/inc/Stipple.h b/inc/Stipple.h
deleted file mode 100755
index 76485883..00000000
--- a/inc/Stipple.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $Id: Stipple.h,v 1.2 1999/01/03 02:05:47 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-/*
-*
-*		Author: Mitsunori Matsuda
-*		Date  : August 26, 1988
-*/
-
-/************************************************************************/
-/*									*/
-/*									*/
-/*									*/
-/*									*/
-/*									*/
-/************************************************************************/
-
-/************************************************************************/
-/*									*/
-/*	(C) Copyright 1989-92 Venue. All Rights Reserved.		*/
-/*	Manufactured in the United States of America.			*/
-/*									*/
-/************************************************************************/
-
-
-#define check_width  16
-#define check_height 16
-static char check_bits[] = { 0x88, 0x88
-			 , 0x00, 0x00
-			 , 0x22, 0x22
-			 , 0x00, 0x00
-			 , 0x88, 0x88
-			 , 0x00, 0x00
-			 , 0x22, 0x22
-			 , 0x00, 0x00
-			 , 0x88, 0x88
-			 , 0x00, 0x00
-			 , 0x22, 0x22
-			 , 0x00, 0x00
-			 , 0x88, 0x88
-			 , 0x00, 0x00
-			 , 0x22, 0x22
-			 , 0x00, 0x00 };
diff --git a/inc/XCursors.h b/inc/XCursors.h
deleted file mode 100755
index 74428f63..00000000
--- a/inc/XCursors.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/* $Id: XCursors.h,v 1.2 1999/01/03 02:05:48 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-/*
-*
-*		Author: Mitsunori Matsuda
-*		Date  : August 29, 1988
-*/
-
-
-
-/************************************************************************/
-/*									*/
-/*	(C) Copyright 1989-92 Venue. All Rights Reserved.		*/
-/*	Manufactured in the United States of America.			*/
-/*									*/
-/************************************************************************/
-
-
-char horizscrollcursor_bitmap[]={
-	  0x00, 0x00
-	, 0x00, 0x00
-	, 0x00, 0x00
-	, 0x00, 0x00
-	, 0x00, 0x00
-	, 0x00, 0x00
-	, 0x08, 0x20
-	, 0x18, 0x30
-	, 0x38, 0x38
-	, 0x78, 0x3C
-	, 0xFF, 0xFE
-	, 0xFF, 0xFE
-	, 0x78, 0x3C
-	, 0x38, 0x38
-	, 0x18, 0x30
-	, 0x08, 0x20
-};
-
-LISP_CURSOR horizscroll_cursor = {
-		  1
-		, horizscrollcursor_bitmap
-		, horizscrollcursor_bitmap
-		, 7
-		, 5
-		, NULL
-};
-	
-
-
-char horizthumbcursor_bitmap[]={
-	  0x00, 0x00
-	, 0x00, 0x00
-	, 0x00, 0x00
-	, 0x02, 0x00
-	, 0x02, 0x00
-	, 0x0A, 0x80
-	, 0x0A, 0x80
-	, 0x0A, 0x80
-	, 0x2A, 0xA0
-	, 0x2A, 0xA0
-	, 0x2A, 0xA0
-	, 0xAA, 0xA8
-	, 0xAA, 0xA8
-	, 0xAA, 0xA8
-	, 0xAA, 0xA8
-	, 0xAA, 0xA8
-};
-
-LISP_CURSOR horizthumb_cursor = {
-		  1
-		, horizthumbcursor_bitmap
-		, horizthumbcursor_bitmap
-		, 6
-		, 8
-		, NULL
-};
-	
-
-
-char scrolldowncursor_bitmap[]={
-		  0x03, 0x80
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x1F, 0xF0
-		, 0x1F, 0xF0
-		, 0x0F, 0xE0
-		, 0x0F, 0xE0
-		, 0x07, 0xC0	
-		, 0x07, 0xC0	
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x01, 0x00
-};
-
-LISP_CURSOR scrolldown_cursor = {
-		  1
-		, scrolldowncursor_bitmap
-		, scrolldowncursor_bitmap
-		, 7
-		, 15
-		, NULL
-};
-	
-
-
-char scrollleftcursor_bitmap[]={
-	  0x00, 0x00
-	, 0x00, 0x00
-	, 0x00, 0x00
-	, 0x00, 0x00
-	, 0x00, 0x00
-	, 0x00, 0x00
-	, 0x00, 0x80
-	, 0x03, 0x80
-	, 0x0F, 0x80
-	, 0x3F, 0x80
-	, 0xFF, 0xFF
-	, 0xFF, 0xFF
-	, 0x3F, 0x80
-	, 0x0F, 0x80
-	, 0x03, 0x80
-	, 0x00, 0x80
-};
-
-LISP_CURSOR scrollleft_cursor = {
-		  1
-		, scrollleftcursor_bitmap
-		, scrollleftcursor_bitmap
-		, 8
-		, 5
-		, NULL
-};
-	
-
-
-char scrollrightcursor_bitmap[]={
-	  0x00, 0x00
-	, 0x00, 0x00
-	, 0x00, 0x00
-	, 0x00, 0x00
-	, 0x00, 0x00
-	, 0x00, 0x00
-	, 0x01, 0x00
-	, 0x01, 0xC0
-	, 0x01, 0xF0
-	, 0x01, 0xFC
-	, 0xFF, 0xFF
-	, 0xFF, 0xFF
-	, 0x01, 0xFC
-	, 0x01, 0xF0
-	, 0x01, 0xC0
-	, 0x01, 0x00
-};
-
-LISP_CURSOR scrollright_cursor = {
-		  1
-		, scrollrightcursor_bitmap
-		, scrollrightcursor_bitmap
-		, 7
-		, 5
-		, NULL
-};
-	
-
-
-char scrollupcursor_bitmap[]={
-		  0x01, 0x00
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x07, 0xC0	
-		, 0x07, 0xC0	
-		, 0x0F, 0xE0
-		, 0x0F, 0xE0
-		, 0x1F, 0xF0
-		, 0x1F, 0xF0
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x03, 0x80
-};
-
-LISP_CURSOR scrollup_cursor = {
-		  1
-		, scrollupcursor_bitmap
-		, scrollupcursor_bitmap
-		, 7
-		, 15
-		, NULL
-};
-	
-
-
-char vertscrollcursor_bitmap[]={
-		  0x01, 0x00
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x07, 0xC0	
-		, 0x07, 0xC0	
-		, 0x0F, 0xE0
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x0F, 0xE0
-		, 0x07, 0xC0	
-		, 0x07, 0xC0	
-		, 0x03, 0x80
-		, 0x03, 0x80
-		, 0x01, 0x00
-};
-
-LISP_CURSOR vertscroll_cursor = {
-		  1
-		, vertscrollcursor_bitmap
-		, vertscrollcursor_bitmap
-		, 7
-		, 15
-		, NULL
-};
-	
-
-
-char vertthumbcursor_bitmap[]={
-		 0x00,0x00
-		,0x00,0x1f
-		,0x00,0x00
-		,0x00,0xff
-		,0x00,0x00
-		,0x07,0xff
-		,0x00,0x00
-		,0x1f,0xff
-		,0x00,0x00
-		,0x07,0xff
-		,0x00,0x00
-		,0x00,0xff
-		,0x00,0x00
-		,0x00,0x1f
-		,0x00,0x00
-		,0x00,0x00
-};
-
-LISP_CURSOR vertthumb_cursor = {
-		  1
-		, vertthumbcursor_bitmap
-		, vertthumbcursor_bitmap
-		, 8
-		, 8
-		, NULL
-};
-	
diff --git a/inc/XVersion.h b/inc/XVersion.h
deleted file mode 100755
index ea0861e5..00000000
--- a/inc/XVersion.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* $Id: XVersion.h,v 1.2 1999/01/03 02:05:48 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-
-
-
-
-
-
-/************************************************************************/
-/*									*/
-/*	(C) Copyright 1989-92 Venue. All Rights Reserved.		*/
-/*	Manufactured in the United States of America.			*/
-/*									*/
-/************************************************************************/
-
-
-
-#ifdef XWINDOW
-#ifdef XV11R4
-#undef XV11R1
-#undef XV11R2
-#undef XV11R3
-#endif /* XV11R4 */
-
-
-#ifdef XV11R3
-#undef XV11R1
-#undef XV11R2
-#undef XV11R4
-#endif /* XV11R3 */
-
-
-#ifdef XV11R2
-#undef XV11R1
-#undef XV11R3
-#undef XV11R4
-#endif /* XV11R2 */
-
-
-#ifdef XV11R1
-#undef XV11R2
-#undef XV11R3
-#undef XV11R4
-#endif /* XV11R1 */
-
-
-#if ( !(defined( XV11R1 ))  \
-   && !(defined( XV11R2 ))  \
-   && !(defined( XV11R3 ))  \
-   && !(defined( XV11R4 )) )
-#define XV11R4			/* newest version */
-#endif
-#endif /* XWINDOW */
-
-
-
diff --git a/inc/XWaitCur.h b/inc/XWaitCur.h
deleted file mode 100755
index 7379aa91..00000000
--- a/inc/XWaitCur.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $Id: XWaitCur.h,v 1.2 1999/01/03 02:05:49 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-/*
-*
-*
-* Copyright (C) 1988 by Fuji Xerox co.,Ltd. All rights reserved.
-*
-*		Author: Mitsunori Matsuda
-*		Date  : August 30, 1988
-*/
-
-
-/************************************************************************/
-/*									*/
-/*	Copyright 1989, 1990 Venue, Fuji Xerox Co., Ltd, Xerox Corp.	*/
-/*									*/
-/*	This file is work-product resulting from the Xerox/Venue	*/
-/*	Agreement dated 18-August-1989 for support of Medley.		*/
-/*									*/
-/************************************************************************/
-
-char waitcursor_bitmap[]=
-  {
-	  0xFF, 0xFE, 0xC0, 0x06, 0x60, 0x1C, 0x3D, 0x78
-	, 0x1F, 0xF0, 0x0F, 0xE0, 0x06, 0xC0, 0x03, 0x80
-	, 0x02, 0x80, 0x03, 0xC0, 0x0D, 0x60, 0x19, 0x30
-	, 0x37, 0xD8, 0x67, 0xEC, 0xFF, 0xFE, 0xFF, 0xFE
-  };
-
-LISP_CURSOR wait_cursor =
-  {
-     1
-   , waitcursor_bitmap
-   , waitcursor_bitmap
-   , 7
-   , 8
-   , NULL
-  };
-	
diff --git a/inc/Xcursdef.h b/inc/Xcursdef.h
deleted file mode 100755
index 5877776b..00000000
--- a/inc/Xcursdef.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $Id: Xcursdef.h,v 1.2 1999/01/03 02:05:49 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-/*
-*
-*
-* Copyright (C) 1988 by Fuji Xerox co.,Ltd. All rights reserved.
-*
-*		Author: Mitsunori Matsuda
-*		Date  : August 29, 1988
-*/
-
-
-/************************************************************************/
-/*									*/
-/*	Structure used to describe cursors in the X version of Medley.	*/
-/*									*/
-/*									*/
-/*									*/
-/************************************************************************/
-
-
-/************************************************************************/
-/*									*/
-/*	Copyright 1989, 1990 Venue, Fuji Xerox Co., Ltd, Xerox Corp.	*/
-/*									*/
-/*	This file is work-product resulting from the Xerox/Venue	*/
-/*	Agreement dated 18-August-1989 for support of Medley.		*/
-/*									*/
-/************************************************************************/
-
-
-typedef struct {
-	short cubitsprepixel;	/* bits per pixel in the cursor, mostly 1 */
-	char *cuimage;		/* the image bitmap */
-	char *cumask;		/* the mask bitmap */
-	short cuhotspotx;	/* hot-spot X coordinate */
-	short cuhotspoty;	/* hot-spot Y coordinate */
-	short cudata;		/* ?? */
-} LISP_CURSOR;
diff --git a/inc/Xdefcur.h b/inc/Xdefcur.h
deleted file mode 100755
index b942ee95..00000000
--- a/inc/Xdefcur.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $Id: Xdefcur.h,v 1.2 1999/01/03 02:05:50 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-/*
-*
-*
-* Copyright (C) 1988 by Fuji Xerox co.,Ltd. All rights reserved.
-*
-*		Author: Mitsunori Matsuda
-*		Date  : August 30, 1988
-*/
-
-
-/************************************************************************/
-/*									*/
-/*	Copyright 1989, 1990 Venue, Fuji Xerox Co., Ltd, Xerox Corp.	*/
-/*									*/
-/*	This file is work-product resulting from the Xerox/Venue	*/
-/*	Agreement dated 18-August-1989 for support of Medley.		*/
-/*									*/
-/************************************************************************/
-
-
-
-char defaultcursor_bitmap[]=
-  {
-	  0x80, 0, 0xc0, 0, 0xe0, 0, 0xf0, 0 
-	, 0xf8, 0, 0xfc, 0, 0xfe, 0, 0xf0, 0
-	, 0xd8, 0, 0x98, 0, 0x0c, 0, 0x0c, 0
-	, 0x06, 0, 0x06, 0, 0x03, 0, 0x03, 0
-  };
-	
-LISP_CURSOR default_cursor =
-  { 
-     1
-   , defaultcursor_bitmap
-   , defaultcursor_bitmap
-   , 0
-   , 15
-   , NULL 
-  };
diff --git a/inc/Xdeflt.h b/inc/Xdeflt.h
deleted file mode 100755
index 69869d4c..00000000
--- a/inc/Xdeflt.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* $Id: Xdeflt.h,v 1.2 1999/01/03 02:05:50 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-
-
-
-/*
-*
-*	Define the X window Medley runs in.
-*
-*/
-
-
-/************************************************************************/
-/*									*/
-/*	(C) Copyright 1989-94 Venue. All Rights Reserved.		*/
-/*	Manufactured in the United States of America.			*/
-/*									*/
-/************************************************************************/
-
-
-#define DEF_WIN_X       20
-#define DEF_WIN_Y       20
-#define DEF_WIN_WIDTH  565
-#define DEF_WIN_HEIGHT 430
-#define WIN_MIN_WIDTH  150
-#define WIN_MIN_HEIGHT 100
-#define DEF_BDRWIDE      2
-#define SCROLL_WIDTH	18
-#define WINDOW_NAME    "Medley (C) Copyright 1980-94 Venue"
-#define ICON_NAME      "Medley"
-
diff --git a/inc/Xdisplay.h b/inc/Xdisplay.h
deleted file mode 100755
index 8cf6b93d..00000000
--- a/inc/Xdisplay.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $Id: Xdisplay.h,v 1.2 1999/01/03 02:05:51 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-/*
-*
-*
-* Copyright (C) 1988 by Fuji Xerox co.,Ltd. All rights reserved.
-*
-*		Author: Mitsunori Matsuda
-*		Date  : July 26,1988
-*/
-
-
-/************************************************************************/
-/*									*/
-/*	Copyright 1989, 1990 Venue, Fuji Xerox Co., Ltd, Xerox Corp.	*/
-/*									*/
-/*	This file is work-product resulting from the Xerox/Venue	*/
-/*	Agreement dated 18-August-1989 for support of Medley.		*/
-/*									*/
-/************************************************************************/
-
-
-typedef struct
-  {
-    char *name;		/* name of this window */
-    Window win;          	/* window id */
-    int    x,y;          	/* x and y coordinates */
-    int    width,height; 	/* window size */
-    int    border;       	/* border width */
-    GC     *gc; 
-    unsigned logn event_mask;
-    Cursor *cursor;      	/* current cursor */
-    int    (*func)();    	/* Event Function */
-  } MyWindow;
-
-
-typedef struct
-  {
-    int type;     /* Event type */
-    int (*func)();/* Event function */
-  } MyEvent;
-
-
-typedef struct 
-  {
-    int left_x;  /* x coordinate of upper-left corner */
-    int top_y;   /* y coordinate of upper-left corner */
-    int right_x; /* x coordinate of lower-right corner */
-    int bottom_y;/* y coordinate of lower-right corner */
-  } DisplayArea;
-
diff --git a/inc/Xicon.h b/inc/Xicon.h
deleted file mode 100755
index a5e78461..00000000
--- a/inc/Xicon.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* $Id: Xicon.h,v 1.2 1999/01/03 02:05:51 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-
-
-/************************************************************************/
-/*									*/
-/*	(C) Copyright 1989, 1990, 1991 Venue. All Rights Reserved.	*/
-/*	Manufactured in the United States of America.			*/
-/*									*/
-/************************************************************************/
-
-
-
-int Lisp_icon_width = 88;
-int Lisp_icon_height = 58;
-
-char Lisp_icon[] = 
-  {
-    0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08,
-    0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x3f, 0xe2,
-    0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x10, 0x20,
-    0xbf, 0xff, 0xff, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x97, 0xa8,
-    0x3f, 0xff, 0xff, 0xa0, 0x82, 0x08, 0x20, 0x82, 0x08, 0x30, 0x22,
-    0x20, 0x00, 0x00, 0x88, 0x20, 0x82, 0x08, 0x20, 0x83, 0xf0, 0x20,
-    0xa0, 0x00, 0x00, 0x82, 0x08, 0x20, 0x82, 0x08, 0x21, 0x10, 0x28,
-    0x24, 0x01, 0x00, 0xa0, 0x87, 0xff, 0xff, 0xc2, 0x09, 0x1f, 0xe2,
-    0x29, 0xb2, 0x00, 0x88, 0x24, 0x00, 0x00, 0x60, 0x83, 0x04, 0x20,
-    0xa9, 0xb2, 0x50, 0x82, 0x0c, 0x00, 0x00, 0x48, 0x21, 0x06, 0x08,
-    0x29, 0xb2, 0x00, 0xa0, 0x87, 0xff, 0xff, 0xc2, 0x09, 0xfc, 0x82,
-    0x24, 0x01, 0x00, 0xbf, 0xff, 0xff, 0xff, 0xe0, 0x82, 0x08, 0x20,
-    0xa0, 0x00, 0x00, 0xbf, 0xff, 0xe0, 0x08, 0x48, 0x21, 0xfe, 0x08,
-    0x20, 0x01, 0x20, 0xe0, 0x00, 0x20, 0x0f, 0x42, 0x0a, 0x02, 0x82,
-    0x20, 0x00, 0x90, 0xe0, 0x00, 0x3f, 0xf8, 0x60, 0x83, 0xfe, 0x20,
-    0xa5, 0x48, 0x90, 0xbf, 0xff, 0xff, 0xff, 0x48, 0x20, 0x82, 0x08,
-    0x20, 0x00, 0x90, 0xbf, 0xff, 0xe0, 0x08, 0x42, 0x08, 0x20, 0x82,
-    0x20, 0x01, 0x20, 0xa0, 0x00, 0x35, 0x4f, 0x7f, 0xff, 0xff, 0xe0,
-    0xa0, 0x00, 0x00, 0xaa, 0xa0, 0x20, 0x08, 0x5f, 0xff, 0xff, 0xe8,
-    0x20, 0x00, 0x00, 0xa0, 0x00, 0x35, 0x4f, 0x50, 0x00, 0x00, 0x22,
-    0x3f, 0xff, 0xff, 0xab, 0x56, 0x20, 0x08, 0x70, 0x07, 0xc0, 0x20,
-    0x82, 0x00, 0x00, 0x20, 0x00, 0x35, 0x0f, 0xd0, 0x0c, 0x47, 0xa8,
-    0x22, 0x00, 0x00, 0x2d, 0x5a, 0xa0, 0x08, 0x90, 0x0f, 0xcc, 0xa2,
-    0x0a, 0x00, 0x00, 0x20, 0x00, 0x34, 0x08, 0x30, 0x10, 0x17, 0xa0,
-    0x82, 0x00, 0x00, 0x20, 0x00, 0x20, 0x0a, 0x10, 0x17, 0xd0, 0x28,
-    0x22, 0x00, 0x00, 0x20, 0x00, 0x35, 0x08, 0x90, 0x2c, 0x67, 0xa2,
-    0x0a, 0x00, 0x00, 0x20, 0x00, 0x20, 0x08, 0x30, 0x37, 0xdc, 0xa0,
-    0x82, 0x00, 0x00, 0x20, 0x00, 0x35, 0x4a, 0x17, 0xe0, 0x07, 0xa8,
-    0x22, 0x00, 0x00, 0x20, 0x00, 0x20, 0x08, 0x94, 0x57, 0xc0, 0x22,
-    0x0a, 0x00, 0x00, 0x20, 0x00, 0x20, 0x08, 0x37, 0xec, 0x40, 0x20,
-    0x83, 0xff, 0xff, 0xe0, 0x00, 0x20, 0x0a, 0x10, 0x27, 0xc0, 0x28,
-    0x20, 0x82, 0x08, 0x20, 0x00, 0x20, 0x08, 0x90, 0x10, 0x00, 0x22,
-    0x08, 0x20, 0x82, 0x20, 0x00, 0x3f, 0xf8, 0x30, 0x1f, 0xc0, 0x20,
-    0x82, 0x08, 0x20, 0xa0, 0x00, 0x20, 0x82, 0x10, 0x0c, 0x40, 0x28,
-    0x20, 0x82, 0x08, 0x3f, 0xff, 0xe8, 0x20, 0x90, 0x07, 0xc0, 0x22,
-    0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x30, 0x00, 0x00, 0x20,
-    0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x10, 0x00, 0x00, 0x28,
-    0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x9f, 0xff, 0xff, 0xe2,
-    0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20,
-    0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82, 0x08,
-    0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x20, 0x82, 0x08, 0x20, 0x82,
-    0x42, 0x13, 0x18, 0xc7, 0x80, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
-    0x99, 0x34, 0xa5, 0x24, 0x29, 0x26, 0x38, 0xc5, 0x04, 0x00, 0x00,
-    0xa1, 0x14, 0x99, 0x27, 0x35, 0x29, 0x40, 0x26, 0x9c, 0x00, 0x00,
-    0xa1, 0x13, 0xa4, 0xe4, 0x25, 0x29, 0x30, 0xe4, 0xa4, 0x00, 0x00,
-    0xa1, 0x10, 0xa4, 0x24, 0x24, 0xc9, 0x09, 0x24, 0xa4, 0x00, 0x00,
-    0x5a, 0x13, 0x18, 0xc7, 0xa4, 0xc6, 0x70, 0xd4, 0x9c, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x03, 0xc0, 0x50, 0x84, 0x00, 0x00, 0x01, 0xc0, 0x02, 0x10, 0x20,
-    0x02, 0x12, 0x00, 0x48, 0xcb, 0x32, 0x22, 0x0c, 0x02, 0x38, 0x20,
-    0x03, 0x92, 0x50, 0x31, 0x2c, 0x49, 0x42, 0x12, 0x02, 0x10, 0xe0,
-    0x02, 0x12, 0x50, 0x31, 0xe8, 0x48, 0x82, 0x12, 0x02, 0x11, 0x20,
-    0x02, 0x16, 0x50, 0x49, 0x08, 0x49, 0x42, 0x12, 0x02, 0x15, 0x20,
-    0x02, 0x0a, 0x50, 0x84, 0xc8, 0x32, 0x21, 0xcc, 0x93, 0xc8, 0xe0,
-    0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00,
-    0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 
-  };
diff --git a/src/ldeboot.c b/src/ldeboot.c
index 78e7d852..fd137734 100644
--- a/src/ldeboot.c
+++ b/src/ldeboot.c
@@ -37,7 +37,6 @@
 #ifdef XWINDOW
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include "XVersion.h"
 #define LDEX "ldex"
 #endif /* XWINDOW */
 
diff --git a/src/mnwevent.c b/src/mnwevent.c
index 49308245..e1f61106 100644
--- a/src/mnwevent.c
+++ b/src/mnwevent.c
@@ -16,7 +16,6 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-/* #include "XVersion.h" */
 #include "lispemul.h"
 #include "lsptypes.h"
 #include "MyWindow.h"