diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2832ebc1..851d4a2b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,6 @@ IF(MAIKO_DISPLAY_X11)
     inc/xmkicondefs.h
     inc/xrdoptdefs.h
     inc/xscrolldefs.h
-    inc/xscroll.h
     inc/xwinmandefs.h
   )
   MESSAGE("-- Configured for X11 display")
@@ -292,7 +291,7 @@ SET(MAIKO_HDRS
     inc/bindefs.h
     inc/bindsdefs.h
     inc/bitbltdefs.h
-    inc/bitblt.h
+    inc/bbtmacro.h
     inc/bltdefs.h
     inc/byteswapdefs.h
     inc/car-cdrdefs.h
@@ -317,7 +316,6 @@ SET(MAIKO_HDRS
     inc/emlglob.h
     inc/eqfdefs.h
     inc/etherdefs.h
-    inc/ether.h
     inc/fast_dsp.h
     inc/findkeydefs.h
     inc/foreigndefs.h
@@ -396,14 +394,14 @@ SET(MAIKO_HDRS
     inc/opcodes.h
     inc/os.h
     inc/osmsgdefs.h
-    inc/osmsg.h
+    inc/osmsgprint.h
     inc/perrnodefs.h
     inc/picture.h
     inc/pilotbbt.h
     inc/print.h
     inc/rawrs232c.h
+    inc/retmacro.h
     inc/returndefs.h
-    inc/return.h
     inc/rpcdefs.h
     inc/rplconsdefs.h
     inc/rs232c.h
@@ -421,7 +419,6 @@ SET(MAIKO_HDRS
     inc/tos1defs.h
     inc/tosfns.h
     inc/tosret.h
-    inc/tty.h
     inc/typeofdefs.h
     inc/ubf1defs.h
     inc/ubf2defs.h
@@ -437,7 +434,6 @@ SET(MAIKO_HDRS
     inc/vars3defs.h
     inc/version.h
     inc/vmemsavedefs.h
-    inc/vmemsave.h
     inc/xcdefs.h
     inc/z2defs.h
 )
diff --git a/bin/makefile-dos b/bin/makefile-dos
index f4cd82f9..98668365 100644
--- a/bin/makefile-dos
+++ b/bin/makefile-dos
@@ -18,7 +18,7 @@ SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c         gcrcell.c llstk.
 OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj         gcr.obj  gcrcell.obj llstk.obj  gcscan.obj loopsops.obj storage.obj     allocmds.obj dir.obj gvar2.obj lowlev1.obj      subr.obj arithops.obj lowlev2.obj       subr0374.obj doscomm.obj     hardrtn.obj lsthandl.obj sxhash.obj draw.obj main.obj testtool.obj array.obj        dsk.obj inet.obj misc7.obj timer.obj    array2.obj dspif.obj initdsp.obj miscn.obj      typeof.obj array3.obj initkbd.obj ubf1.obj      array4.obj dspsubrs.obj initsout.obj    mkatom.obj ubf2.obj array5.obj eqf.obj  intcall.obj mkcell.obj ubf3.obj array6.obj      ether.obj ufn.obj atom.obj      findkey.obj kbdsubrs.obj mouseif.obj ufs.obj    bbtsub.obj foreign.obj keyevent.obj     unixcomm.obj bin.obj fp.obj binds.obj fvar.obj mvs.obj      unwind.obj bitblt.obj gc.obj    uraid.obj blt.obj gc2.obj       kprint.obj osmsg.obj usrsubr.obj byteswap.obj   gcarray.obj perrno.obj uutils.obj       carcdr.obj asmbbt.obj gccode.obj        vars3.obj gcfinal.obj ldsout.obj        return.obj vmemsave.obj chardev.obj     gchtfind.obj lineblt8.obj rpc.obj xc.obj        common.obj gcmain3.obj lisp2c.obj rplcons.obj   z2.obj  vdate.obj $(COLORFILES) $(ARCHFILES) $(LPFILES)
 
 
-HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bitblt.h debug.h devconf.h dspdata.h ether.h    fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h  opcodes.h osmsg.h pilotbbt.h print.h return.h stack.h stream.h subrs.h timeout.h   tos1defs.h tosfns.h tosret.h vmemsave.h         xdefs.h xbitmaps.h xkeymap.h
+HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h  dspif.h ifpage.h iopage.h lispemul.h lispmap.h  lsptypes.h miscstat.h lspglob.h array.h bb.h    bbtmacro.h debug.h devconf.h dspdata.h fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h         lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h  opcodes.h osmsgprint.h pilotbbt.h print.h retmacro.h stack.h stream.h subrs.h timeout.h   tos1defs.h tosfns.h tosret.h xdefs.h xbitmaps.h xkeymap.h
 
 
 
@@ -35,7 +35,7 @@ emul.exe : $(OFILES)
 	del copts
 	@ echo "Executable is now named '$@'"
    
-main.o  :       lispemul.h address.h lsptypes.h adr68k.h stack.h lspglob.h lispmap.h ifpage.h iopage.h return.h debug.h
+main.o  :       lispemul.h address.h lsptypes.h adr68k.h stack.h lspglob.h lispmap.h ifpage.h iopage.h retmacro.h debug.h
 
 
 													
diff --git a/bin/makefile-tail b/bin/makefile-tail
index 508e9988..d6277f70 100644
--- a/bin/makefile-tail
+++ b/bin/makefile-tail
@@ -192,7 +192,7 @@ $(OBJECTDIR)ldeether.o: $(SRCDIR)ldeether.c $(REQUIRED-INCS)
 $(OBJECTDIR)main.o: $(SRCDIR)main.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)dbprint.h \
 	$(INCDIR)emlglob.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)stack.h \
-	$(INCDIR)return.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
+	$(INCDIR)retmacro.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
 	$(INCDIR)miscstat.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)debug.h \
 	$(INCDIR)timeout.h $(INCDIR)maindefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)dirdefs.h $(INCDIR)dspifdefs.h $(INCDIR)devif.h \
@@ -292,7 +292,7 @@ $(OBJECTDIR)bitblt.o: $(SRCDIR)bitblt.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)pilotbbt.h $(INCDIR)display.h \
-	$(INCDIR)bitblt.h $(INCDIR)bb.h $(INCDIR)bitbltdefs.h $(INCDIR)initdspdefs.h
+	$(INCDIR)bbtmacro.h $(INCDIR)bb.h $(INCDIR)bitbltdefs.h $(INCDIR)initdspdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)bitblt.c -o $(OBJECTDIR)bitblt.o
 
 $(OBJECTDIR)bbt68k.o: $(OBJECTDIR)bbt68k.i $(SRCDIR)bbt68k.s
@@ -308,10 +308,10 @@ $(OBJECTDIR)bbtsub.o: $(SRCDIR)bbtsub.c $(REQUIRED-INCS) \
 	$(INCDIR)xdefs.h $(INCDIR)lispemul.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)lispmap.h $(INCDIR)lsptypes.h \
 	$(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)arith.h \
-	$(INCDIR)stack.h $(INCDIR)return.h $(INCDIR)cell.h $(INCDIR)gcdata.h \
+	$(INCDIR)stack.h $(INCDIR)retmacro.h $(INCDIR)cell.h $(INCDIR)gcdata.h \
 	$(INCDIR)bbtsubdefs.h $(INCDIR)car-cdrdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)gcarraydefs.h $(INCDIR)initdspdefs.h $(INCDIR)kprintdefs.h \
-	$(INCDIR)llstkdefs.h $(INCDIR)returndefs.h $(INCDIR)bb.h $(INCDIR)bitblt.h \
+	$(INCDIR)llstkdefs.h $(INCDIR)returndefs.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)pilotbbt.h $(INCDIR)dspdata.h $(INCDIR)display.h $(INCDIR)dbprint.h \
 	$(INCDIR)devif.h
 	$(CC) $(RFLAGS) $(SRCDIR)bbtsub.c -o $(OBJECTDIR)bbtsub.o
@@ -340,7 +340,7 @@ $(OBJECTDIR)car-cdr.o: $(SRCDIR)car-cdr.c $(REQUIRED-INCS) \
 $(OBJECTDIR)chardev.o: $(SRCDIR)chardev.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)arith.h $(INCDIR)timeout.h \
-	$(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsg.h $(INCDIR)dbprint.h \
+	$(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)dbprint.h \
 	$(INCDIR)chardevdefs.h $(INCDIR)byteswapdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)perrnodefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)chardev.c -o $(OBJECTDIR)chardev.o
@@ -348,7 +348,7 @@ $(OBJECTDIR)chardev.o: $(SRCDIR)chardev.c $(REQUIRED-INCS) \
 $(OBJECTDIR)rawcolor.o: $(SRCDIR)rawcolor.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \
 	$(INCDIR)lspglob.h $(INCDIR)lispmap.h $(INCDIR)lsptypes.h \
 	$(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)address.h \
-	$(INCDIR)pilotbbt.h $(INCDIR)display.h $(INCDIR)bitblt.h \
+	$(INCDIR)pilotbbt.h $(INCDIR)display.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)arith.h $(INCDIR)cell.h $(INCDIR)dspdata.h $(INCDIR)debug.h \
 	$(INCDIR)stream.h $(INCDIR)bbtsubdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)rawcolor.c -o $(OBJECTDIR)rawcolor.o
@@ -357,7 +357,7 @@ $(OBJECTDIR)llcolor.o: $(SRCDIR)llcolor.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h \
-	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bitblt.h \
+	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)pilotbbt.h $(INCDIR)dbprint.h $(INCDIR)llcolordefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)llcolor.c -o $(OBJECTDIR)llcolor.o
 
@@ -391,7 +391,7 @@ $(OBJECTDIR)mkcell.o: $(SRCDIR)mkcell.c $(REQUIRED-INCS) \
 $(OBJECTDIR)draw.o: $(SRCDIR)draw.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)lispmap.h \
-	$(INCDIR)lsptypes.h $(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)bitblt.h \
+	$(INCDIR)lsptypes.h $(INCDIR)emlglob.h $(INCDIR)adr68k.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)display.h $(INCDIR)drawdefs.h $(INCDIR)bbtsubdefs.h \
 	$(INCDIR)initdspdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)draw.c -o $(OBJECTDIR)draw.o
@@ -423,7 +423,7 @@ $(OBJECTDIR)fp.o: $(SRCDIR)fp.c $(REQUIRED-INCS) \
 $(OBJECTDIR)intcall.o: $(SRCDIR)intcall.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)address.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)stack.h \
-	$(INCDIR)return.h $(INCDIR)emlglob.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
+	$(INCDIR)retmacro.h $(INCDIR)emlglob.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)initatms.h $(INCDIR)cell.h \
 	$(INCDIR)tosfns.h $(INCDIR)intcalldefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)llstkdefs.h $(INCDIR)returndefs.h
@@ -450,7 +450,7 @@ $(OBJECTDIR)ubf3.o: $(SRCDIR)ubf3.c $(REQUIRED-INCS) \
 $(OBJECTDIR)uutils.o: $(SRCDIR)uutils.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)adr68k.h \
 	$(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
-	$(INCDIR)miscstat.h $(INCDIR)osmsg.h $(INCDIR)keyboard.h $(INCDIR)uutilsdefs.h \
+	$(INCDIR)miscstat.h $(INCDIR)osmsgprint.h $(INCDIR)keyboard.h $(INCDIR)uutilsdefs.h \
 	$(INCDIR)osmsgdefs.h $(INCDIR)uraiddefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)uutils.c -o $(OBJECTDIR)uutils.o
 
@@ -478,21 +478,21 @@ $(OBJECTDIR)ether_common.o: $(SRCDIR)ether_common.c $(REQUIRED-INCS) \
 	$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
+	$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)ether_common.c -o $(OBJECTDIR)ether_common.o
 
 $(OBJECTDIR)ether_sunos.o: $(SRCDIR)ether_sunos.c $(REQUIRED-INCS) \
 	$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
+	$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)ether_sunos.c -o $(OBJECTDIR)ether_sunos.o
 
 $(OBJECTDIR)ether_nethub.o: $(SRCDIR)ether_nethub.c $(REQUIRED-INCS) \
 	$(INCDIR)commondefs.h $(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)emlglob.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)etherdefs.h
+	$(INCDIR)dbprint.h $(INCDIR)etherdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)ether_nethub.c -o $(OBJECTDIR)ether_nethub.o
 
 $(OBJECTDIR)findkey.o: $(SRCDIR)findkey.c $(REQUIRED-INCS) \
@@ -505,7 +505,7 @@ $(OBJECTDIR)dsk.o: $(SRCDIR)dsk.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)arith.h $(INCDIR)stream.h \
-	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsg.h \
+	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h \
 	$(INCDIR)dbprint.h $(INCDIR)dskdefs.h $(INCDIR)byteswapdefs.h \
 	$(INCDIR)car-cdrdefs.h $(INCDIR)cell.h $(INCDIR)commondefs.h \
 	$(INCDIR)ufsdefs.h
@@ -632,7 +632,7 @@ $(OBJECTDIR)hardrtn.o: $(SRCDIR)hardrtn.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h \
-	$(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)return.h $(INCDIR)hardrtndefs.h \
+	$(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)retmacro.h $(INCDIR)hardrtndefs.h \
 	$(INCDIR)commondefs.h $(INCDIR)llstkdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)hardrtn.c -o $(OBJECTDIR)hardrtn.o
 
@@ -640,7 +640,7 @@ $(OBJECTDIR)inet.o: $(SRCDIR)inet.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)arith.h $(INCDIR)emlglob.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
-	$(INCDIR)ether.h $(INCDIR)dbprint.h $(INCDIR)locfile.h $(INCDIR)lispver2.h \
+	$(INCDIR)dbprint.h $(INCDIR)locfile.h $(INCDIR)lispver2.h \
 	$(INCDIR)inetdefs.h $(INCDIR)byteswapdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)mkcelldefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)inet.c -o $(OBJECTDIR)inet.o
@@ -649,7 +649,7 @@ $(OBJECTDIR)initdsp.o: $(SRCDIR)initdsp.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)lsptypes.h $(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h \
-	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bitblt.h \
+	$(INCDIR)display.h $(INCDIR)devconf.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)pilotbbt.h $(INCDIR)dbprint.h $(INCDIR)initdspdefs.h \
 	$(INCDIR)byteswapdefs.h $(INCDIR)xcursordefs.h $(INCDIR)devif.h
 	$(CC) $(RFLAGS) $(SRCDIR)initdsp.c -o $(OBJECTDIR)initdsp.o
@@ -682,7 +682,7 @@ $(OBJECTDIR)keyevent.o: $(SRCDIR)keyevent.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lspglob.h \
 	$(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)adr68k.h \
 	$(INCDIR)address.h $(INCDIR)stack.h $(INCDIR)keyboard.h $(INCDIR)display.h \
-	$(INCDIR)lsptypes.h $(INCDIR)bb.h $(INCDIR)bitblt.h $(INCDIR)pilotbbt.h \
+	$(INCDIR)lsptypes.h $(INCDIR)bb.h $(INCDIR)bbtmacro.h $(INCDIR)pilotbbt.h \
 	$(INCDIR)keyeventdefs.h $(INCDIR)osmsgdefs.h $(INCDIR)xwinmandefs.h \
 	$(INCDIR)devif.h $(INCDIR)dbprint.h
 	$(CC) $(RFLAGS) $(SRCDIR)keyevent.c -o $(OBJECTDIR)keyevent.o
@@ -698,7 +698,7 @@ $(OBJECTDIR)llstk.o: $(SRCDIR)llstk.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)address.h $(INCDIR)lsptypes.h $(INCDIR)initatms.h \
 	$(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h \
-	$(INCDIR)emlglob.h $(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)return.h \
+	$(INCDIR)emlglob.h $(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)retmacro.h \
 	$(INCDIR)llstkdefs.h $(INCDIR)commondefs.h $(INCDIR)dbgtooldefs.h \
 	$(INCDIR)testtooldefs.h $(INCDIR)kprintdefs.h $(INCDIR)storagedefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)llstk.c -o $(OBJECTDIR)llstk.o
@@ -758,7 +758,7 @@ $(OBJECTDIR)osmsg.o: $(SRCDIR)osmsg.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)arith.h $(INCDIR)stream.h \
 	$(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h $(INCDIR)miscstat.h \
-	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsg.h \
+	$(INCDIR)timeout.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)osmsgprint.h \
 	$(INCDIR)dbprint.h $(INCDIR)commondefs.h $(INCDIR)osmsgdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)osmsg.c -o $(OBJECTDIR)osmsg.o
 
@@ -766,7 +766,7 @@ $(OBJECTDIR)return.o: $(SRCDIR)return.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)address.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)stack.h \
 	$(INCDIR)emlglob.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
-	$(INCDIR)miscstat.h $(INCDIR)initatms.h $(INCDIR)cell.h $(INCDIR)return.h \
+	$(INCDIR)miscstat.h $(INCDIR)initatms.h $(INCDIR)cell.h $(INCDIR)retmacro.h \
 	$(INCDIR)returndefs.h $(INCDIR)commondefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)return.c -o $(OBJECTDIR)return.o
 
@@ -828,7 +828,7 @@ $(OBJECTDIR)subr0374.o: $(SRCDIR)subr0374.c $(REQUIRED-INCS) \
 	$(CC) $(RFLAGS) $(SRCDIR)subr0374.c -o $(OBJECTDIR)subr0374.o
 
 $(OBJECTDIR)perrno.o: $(SRCDIR)perrno.c $(REQUIRED-INCS) \
-	$(INCDIR)lispemul.h $(INCDIR)osmsg.h \
+	$(INCDIR)lispemul.h $(INCDIR)osmsgprint.h \
 	$(INCDIR)perrnodefs.h $(INCDIR)osmsgdefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)perrno.c -o $(OBJECTDIR)perrno.o
 
@@ -843,7 +843,7 @@ $(OBJECTDIR)timer.o: $(SRCDIR)timer.c $(REQUIRED-INCS) \
 $(OBJECTDIR)tty.o: $(SRCDIR)tty.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h \
-	$(INCDIR)commondefs.h $(INCDIR)tty.h $(INCDIR)ttydefs.h
+	$(INCDIR)commondefs.h $(INCDIR)ttydefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)tty.c -o $(OBJECTDIR)tty.o
 
 $(OBJECTDIR)typeof.o: $(SRCDIR)typeof.c $(REQUIRED-INCS) \
@@ -876,7 +876,7 @@ $(OBJECTDIR)uraid.o: $(SRCDIR)uraid.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)lispmap.h \
 	$(INCDIR)adr68k.h $(INCDIR)lsptypes.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h \
 	$(INCDIR)iopage.h $(INCDIR)miscstat.h $(INCDIR)emlglob.h $(INCDIR)cell.h \
-	$(INCDIR)debug.h $(INCDIR)devconf.h $(INCDIR)display.h $(INCDIR)bitblt.h \
+	$(INCDIR)debug.h $(INCDIR)devconf.h $(INCDIR)display.h $(INCDIR)bbtmacro.h \
 	$(INCDIR)uraiddefs.h $(INCDIR)dbgtooldefs.h $(INCDIR)stack.h \
 	$(INCDIR)gcarraydefs.h $(INCDIR)initdspdefs.h $(INCDIR)initkbddefs.h \
 	$(INCDIR)kprintdefs.h $(INCDIR)llstkdefs.h $(INCDIR)mkatomdefs.h \
@@ -908,7 +908,7 @@ $(OBJECTDIR)vars3.o: $(SRCDIR)vars3.c $(REQUIRED-INCS) \
 $(OBJECTDIR)vmemsave.o: $(SRCDIR)vmemsave.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h \
 	$(INCDIR)lispmap.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
-	$(INCDIR)miscstat.h $(INCDIR)vmemsave.h $(INCDIR)timeout.h $(INCDIR)adr68k.h \
+	$(INCDIR)miscstat.h $(INCDIR)timeout.h $(INCDIR)adr68k.h \
 	$(INCDIR)lsptypes.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)dbprint.h \
 	$(INCDIR)devif.h $(INCDIR)vmemsavedefs.h $(INCDIR)byteswapdefs.h $(INCDIR)commondefs.h \
 	$(INCDIR)dskdefs.h $(INCDIR)initkbddefs.h $(INCDIR)perrnodefs.h \
@@ -929,7 +929,7 @@ $(OBJECTDIR)usrsubr.o: $(SRCDIR)usrsubr.c $(REQUIRED-INCS) \
 
 $(OBJECTDIR)xc.o: $(SRCDIR)xc.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)emlglob.h \
-	$(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)return.h \
+	$(INCDIR)address.h $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)retmacro.h \
 	$(INCDIR)dbprint.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \
 	$(INCDIR)miscstat.h $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)cell.h \
 	$(INCDIR)initatms.h $(INCDIR)gcdata.h $(INCDIR)arith.h $(INCDIR)stream.h \
@@ -992,7 +992,7 @@ $(OBJECTDIR)xcursor.o: $(SRCDIR)xcursor.c $(REQUIRED-INCS) \
 
 $(OBJECTDIR)xwinman.o: $(SRCDIR)xwinman.c $(REQUIRED-INCS) \
 	$(INCDIR)lispemul.h $(INCDIR)miscstat.h $(INCDIR)devif.h $(INCDIR)xdefs.h \
-	$(INCDIR)xscroll.h $(INCDIR)xwinmandefs.h $(INCDIR)keyeventdefs.h \
+	$(INCDIR)xwinmandefs.h $(INCDIR)keyeventdefs.h \
 	$(INCDIR)xlspwindefs.h $(INCDIR)xscrolldefs.h
 	$(CC) $(RFLAGS) $(SRCDIR)xwinman.c -o $(OBJECTDIR)xwinman.o
 
diff --git a/inc/bitblt.h b/inc/bbtmacro.h
similarity index 96%
rename from inc/bitblt.h
rename to inc/bbtmacro.h
index fee6e27b..eec47ae0 100644
--- a/inc/bitblt.h
+++ b/inc/bbtmacro.h
@@ -1,10 +1,10 @@
-#ifndef BITBLT_H
-#define BITBLT_H 1
+#ifndef BBTMACRO_H
+#define BBTMACRO_H 1
 /* $Id: bitblt.h,v 1.2 1999/01/03 02:05:54 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
 /*
  *	Copyright (C) 1988 by Fuji Xerox Co., Ltd. All rights reserved.
  *
- *	File :  bitblt.h
+ *	File :  bbtmacro.h (was bitblt.h)
  *
  *	Author :  Osamu Nakamura
  *
@@ -85,4 +85,4 @@ extern DLword *EmCursorX68K,*EmCursorY68K;
 #define UNLOCKSCREEN ScreenLocked = NIL
 
 #endif /* DOS */
-#endif /* BITBLT_H */
+#endif /* BBTMACRO_H */
diff --git a/inc/ether.h b/inc/ether.h
deleted file mode 100644
index 4e651dfd..00000000
--- a/inc/ether.h
+++ /dev/null
@@ -1,120 +0,0 @@
-#ifndef ETHER_H
-#define ETHER_H 1
-/* $Id: ether.h,v 1.2 1999/01/03 02:05:59 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-
-/************************************************************************/
-/*									*/
-/*	(C) Copyright 1989-92 Venue. All Rights Reserved.		*/
-/*	Manufactured in the United States of America.			*/
-/*									*/
-/************************************************************************/
-#include "lispemul.h" /* for LispPTR, DLword */
-
-#ifndef BYTESWAP
-
-typedef struct { 
-	DLword	DLLOCALHOST0;
-	DLword	DLLOCALHOST1;
-	DLword	DLLOCALHOST2;
-	DLword	DLFIRSTICB;
-	DLword	DLINPUTMASK;
-	DLword	DLFIRSTOCB;
-	DLword	DLOUTPUTMASK;
-	DLword	DLMISSEDPACKETS;
-	DLword	DLLASTICB;
-	DLword	DLLASTOCB;
-} DLETHERCSB;
-
-typedef struct{ 
-	DLword	DLIOCBLENGTH;
-	DLword	DLIOCBBUFFERLO;
-	DLword	DLIOCBBUFFERHI;
-	DLword	DLRETRANSMISSIONMASK;
-	DLword	DLIOCBBYTESUSED;
-	DLword	DLIOCBSTATUS;
-	DLword	DLNEXTIOCB;
-	DLword	DLFOROUTPUTUSE;
-} DLETHERIOCB;
-
-typedef struct { 
-	unsigned int	NETTYPE : 8;
-	unsigned int	NDBNEXT : 24;
-	unsigned int	NDBPUPNET : 8;
-	unsigned int	NDBNSNET : 24;
-	unsigned int	NDBTASK : 8;
-	unsigned int	NDBBROADCASTP : 24;
-	unsigned int	NDBPUPHOST : 8;
-	unsigned int	NDBTRANSMITTER : 24;
-	unsigned int	nil1: 8;
-	unsigned int	NDBENCAPSULATOR : 24;
-	unsigned int	NDBIQLENGTH : 8; /* DATATYPE */
-	unsigned int	NDBCSB : 24; /* DATATYPE */
-	LispPTR		NDBIQ;
-	LispPTR		NDBTQ;
-	LispPTR		NDBTRANSLATIONS;
-	LispPTR		NDBETHERFLUSHER;
-	LispPTR		NDBWATCHER;
-	LispPTR		NDBCANHEARSELF;
-	LispPTR		NDBIPNET;
-	LispPTR		NDBIPHOST;
-	DLword		NDBPUPTYPE;
-	DLword		nil2;
-	LispPTR		nil3;
-} NDB;
-#else
-	/***********************************************/
-	/* Byte-swapped definitions, for e.g., 80386's */
-	/***********************************************/
-typedef struct { 
-	DLword	DLLOCALHOST1;
-	DLword	DLLOCALHOST0;
-	DLword	DLFIRSTICB;
-	DLword	DLLOCALHOST2;
-	DLword	DLFIRSTOCB;
-	DLword	DLINPUTMASK;
-	DLword	DLMISSEDPACKETS;
-	DLword	DLOUTPUTMASK;
-	DLword	DLLASTOCB;
-	DLword	DLLASTICB;
-} DLETHERCSB;
-
-typedef struct{ 
-	DLword	DLIOCBBUFFERLO;
-	DLword	DLIOCBLENGTH;
-	DLword	DLRETRANSMISSIONMASK;
-	DLword	DLIOCBBUFFERHI;
-	DLword	DLIOCBSTATUS;
-	DLword	DLIOCBBYTESUSED;
-	DLword	DLFOROUTPUTUSE;
-	DLword	DLNEXTIOCB;
-} DLETHERIOCB;
-
-typedef struct { 
-	unsigned int	NDBNEXT : 24;
-	unsigned int	NETTYPE : 8;
-	unsigned int	NDBNSNET : 24;
-	unsigned int	NDBPUPNET : 8;
-	unsigned int	NDBBROADCASTP : 24;
-	unsigned int	NDBTASK : 8;
-	unsigned int	NDBTRANSMITTER : 24;
-	unsigned int	NDBPUPHOST : 8;
-	unsigned int	NDBENCAPSULATOR : 24;
-	unsigned int	nil1: 8;
-	unsigned int	NDBCSB : 24; /* DATATYPE */
-	unsigned int	NDBIQLENGTH : 8; /* DATATYPE */
-	LispPTR		NDBIQ;
-	LispPTR		NDBTQ;
-	LispPTR		NDBTRANSLATIONS;
-	LispPTR		NDBETHERFLUSHER;
-	LispPTR		NDBWATCHER;
-	LispPTR		NDBCANHEARSELF;
-	LispPTR		NDBIPNET;
-	LispPTR		NDBIPHOST;
-	DLword		nil2;
-	DLword		NDBPUPTYPE;
-	LispPTR		nil3;
-} NDB;
-
-#endif /* BYTESWAP */
-
-#endif /* ETHER_H */
diff --git a/inc/lsptypes.h b/inc/lsptypes.h
index ff07eaa2..cdc934d6 100644
--- a/inc/lsptypes.h
+++ b/inc/lsptypes.h
@@ -699,4 +699,111 @@ typedef
 			/* low-order 12 bits first.            */
     } BIGNUM;
 
+
+/* Ethernet records */
+
+#ifndef BYTESWAP
+typedef struct { 
+	DLword	DLLOCALHOST0;
+	DLword	DLLOCALHOST1;
+	DLword	DLLOCALHOST2;
+	DLword	DLFIRSTICB;
+	DLword	DLINPUTMASK;
+	DLword	DLFIRSTOCB;
+	DLword	DLOUTPUTMASK;
+	DLword	DLMISSEDPACKETS;
+	DLword	DLLASTICB;
+	DLword	DLLASTOCB;
+} DLETHERCSB;
+
+typedef struct{ 
+	DLword	DLIOCBLENGTH;
+	DLword	DLIOCBBUFFERLO;
+	DLword	DLIOCBBUFFERHI;
+	DLword	DLRETRANSMISSIONMASK;
+	DLword	DLIOCBBYTESUSED;
+	DLword	DLIOCBSTATUS;
+	DLword	DLNEXTIOCB;
+	DLword	DLFOROUTPUTUSE;
+} DLETHERIOCB;
+
+typedef struct { 
+	unsigned int	NETTYPE : 8;
+	unsigned int	NDBNEXT : 24;
+	unsigned int	NDBPUPNET : 8;
+	unsigned int	NDBNSNET : 24;
+	unsigned int	NDBTASK : 8;
+	unsigned int	NDBBROADCASTP : 24;
+	unsigned int	NDBPUPHOST : 8;
+	unsigned int	NDBTRANSMITTER : 24;
+	unsigned int	nil1: 8;
+	unsigned int	NDBENCAPSULATOR : 24;
+	unsigned int	NDBIQLENGTH : 8; /* DATATYPE */
+	unsigned int	NDBCSB : 24; /* DATATYPE */
+	LispPTR		NDBIQ;
+	LispPTR		NDBTQ;
+	LispPTR		NDBTRANSLATIONS;
+	LispPTR		NDBETHERFLUSHER;
+	LispPTR		NDBWATCHER;
+	LispPTR		NDBCANHEARSELF;
+	LispPTR		NDBIPNET;
+	LispPTR		NDBIPHOST;
+	DLword		NDBPUPTYPE;
+	DLword		nil2;
+	LispPTR		nil3;
+} NDB;
+#else
+	/***********************************************/
+	/* Byte-swapped definitions, for e.g., 80386's */
+	/***********************************************/
+typedef struct { 
+	DLword	DLLOCALHOST1;
+	DLword	DLLOCALHOST0;
+	DLword	DLFIRSTICB;
+	DLword	DLLOCALHOST2;
+	DLword	DLFIRSTOCB;
+	DLword	DLINPUTMASK;
+	DLword	DLMISSEDPACKETS;
+	DLword	DLOUTPUTMASK;
+	DLword	DLLASTOCB;
+	DLword	DLLASTICB;
+} DLETHERCSB;
+
+typedef struct{ 
+	DLword	DLIOCBBUFFERLO;
+	DLword	DLIOCBLENGTH;
+	DLword	DLRETRANSMISSIONMASK;
+	DLword	DLIOCBBUFFERHI;
+	DLword	DLIOCBSTATUS;
+	DLword	DLIOCBBYTESUSED;
+	DLword	DLFOROUTPUTUSE;
+	DLword	DLNEXTIOCB;
+} DLETHERIOCB;
+
+typedef struct { 
+	unsigned int	NDBNEXT : 24;
+	unsigned int	NETTYPE : 8;
+	unsigned int	NDBNSNET : 24;
+	unsigned int	NDBPUPNET : 8;
+	unsigned int	NDBBROADCASTP : 24;
+	unsigned int	NDBTASK : 8;
+	unsigned int	NDBTRANSMITTER : 24;
+	unsigned int	NDBPUPHOST : 8;
+	unsigned int	NDBENCAPSULATOR : 24;
+	unsigned int	nil1: 8;
+	unsigned int	NDBCSB : 24; /* DATATYPE */
+	unsigned int	NDBIQLENGTH : 8; /* DATATYPE */
+	LispPTR		NDBIQ;
+	LispPTR		NDBTQ;
+	LispPTR		NDBTRANSLATIONS;
+	LispPTR		NDBETHERFLUSHER;
+	LispPTR		NDBWATCHER;
+	LispPTR		NDBCANHEARSELF;
+	LispPTR		NDBIPNET;
+	LispPTR		NDBIPHOST;
+	DLword		nil2;
+	DLword		NDBPUPTYPE;
+	LispPTR		nil3;
+} NDB;
+#endif /* BYTESWAP */
 #endif /* LSPTYPES_H */
diff --git a/inc/osmsg.h b/inc/osmsgprint.h
similarity index 90%
rename from inc/osmsg.h
rename to inc/osmsgprint.h
index 3868200f..3503c426 100644
--- a/inc/osmsg.h
+++ b/inc/osmsgprint.h
@@ -1,5 +1,5 @@
-#ifndef OSMSG_H
-#define OSMSG_H 1
+#ifndef OSMSGPRINT_H
+#define OSMSGPRINT_H 1
 /* $Id: osmsg.h,v 1.2 1999/01/03 02:06:20 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
 
 
@@ -23,4 +23,4 @@
     print_exp;					\
   } while (0)
 
-#endif /* OSMSG_H */
+#endif /* OSMSGPRINT_H */
diff --git a/inc/return.h b/inc/retmacro.h
similarity index 97%
rename from inc/return.h
rename to inc/retmacro.h
index e4930321..6332a2bf 100644
--- a/inc/return.h
+++ b/inc/retmacro.h
@@ -1,12 +1,12 @@
-#ifndef RETURN_H
-#define RETURN_H 1
+#ifndef RETMACRO_H
+#define RETMACRO_H 1
 /* $Id: return.h,v 1.2 1999/01/03 02:06:22 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
 
 
 /**************************************************************/
 /*
 
-	File Name : 	return.h
+	File Name : 	retmacro.h (was return.h)
 	Desc. :		Macros for return,contextsw
 
 	Written by :	Takeshi Shimizu
@@ -111,4 +111,4 @@
     S_CHECK( EndSTKP > CurrentStackPTR, 				\
 		"End of stack isn't beyond current stk pointer."); 	\
   } while (0)
-#endif /* RETURN_H */
+#endif /* RETMACRO_H */
diff --git a/inc/tty.h b/inc/tty.h
deleted file mode 100644
index 5ad1582f..00000000
--- a/inc/tty.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef TTY_H
-#define TTY_H 1
-/* $Id: tty.h,v 1.2 1999/01/03 02:06:29 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-
-/************************************************************************/
-/*									*/
-/*	(C) Copyright 1989-96 Venue. All Rights Reserved.		*/
-/*	Manufactured in the United States of America.			*/
-/*									*/
-/************************************************************************/
-#include "lispemul.h" /* for DLword */
-
-/*
- TTY Command
-*/
-
-#define TTY_GET_STATUS     33280>>8
-#define TTY_ON             33536>>8
-#define TTY_OFF            33792>>8
-#define TTY_BREAK_ON       34304>>8
-#define TTY_BREAK_OFF      34560>>8
-#define PUT_CHAR             128
-#define ABORT_PUT            133
-#define SET_PARAM            129
-#define SET_DSR            33025
-#define SET_CTS            33026
-#define SET_CHAR_LENGTH    33028
-#define SET_PARITY         33032
-#define SET_STOP_BITS      33040
-#define SET_BAUD_RATE      33056
-#define SET_ALL_PARAMETERS 33087
-
-typedef struct {
-	unsigned command             : 8;
-	unsigned outdata             : 8;
-} DLTTY_OUT_COMMAND;
-
-typedef struct {
-	unsigned on_off              : 4;
-	unsigned line_speed          : 4;
-	unsigned stop_bits           : 2;
-	unsigned parity              : 2;
-	unsigned char_length         : 2;
-	unsigned clear_to_send       : 1;
-	unsigned data_set_ready      : 1;
-	DLword  notify_mask;
-} DLTTY_OUT_CSB;
-
-typedef struct {
-	unsigned state               : 1;
-	unsigned nil1                : 7;
-	unsigned success             : 1;
-	unsigned break_detected      : 1;
-	unsigned framing_error       : 1;
-	unsigned data_lost           : 1;
-	unsigned parity_error        : 1;
-	unsigned nil2                : 2;
-	unsigned not_ready           : 1;
-	char     in_data;
-	unsigned data_terminal_ready : 1;
-	unsigned nil3                : 4;
-	unsigned request_to_send     : 1;
-	unsigned rx_ready            : 1;
-	unsigned tx_ready            : 1;
-} DLTTY_IN_CSB;
-
-#endif /* TTY_H */
diff --git a/inc/vmemsave.h b/inc/vmemsave.h
deleted file mode 100644
index 9188b8cc..00000000
--- a/inc/vmemsave.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef VMEMSAVE_H
-#define VMEMSAVE_H 1
-/* $Id: vmemsave.h,v 1.2 1999/01/03 02:06:29 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved  */
-
-
-
-/************************************************************************/
-/*									*/
-/*	(C) Copyright 1989-96 Venue. All Rights Reserved.		*/
-/*	Manufactured in the United States of America.			*/
-/*									*/
-/************************************************************************/
-
-
-/*
-	File Name : vmemsave.h
-	DEfinition for vmemsave
-*/
-
-#define	FP_IFPAGE  512			/* IFPAGE address in sysoutfile by Byte */
-#define	DOMINOPAGES  301		/* skip dominopages  in  fptovp */
-#define	SKIPPAGES  301			/* save first filepage  */
-#define	SKIP_DOMINOPAGES  153600	/* Byte size in sysoutfile for dominocode */
-#define	SAVE_IFPAGE	223		/* Virtual address for IFPAGES's buffer page. This value is \EMUSWAPBUFFERS in lisp. */
-#endif /* VMEMSAVE_H */
diff --git a/inc/xscroll.h b/inc/xscroll.h
deleted file mode 100644
index 4e9313e7..00000000
--- a/inc/xscroll.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef XSCROLL_H
-#define XSCROLL_H 1
-/************************************************************************/
-/*									*/
-/*			xscroll.h					*/
-/*									*/
-/* Scrolling functions implemented in xscroll.c				*/
-/*									*/
-/************************************************************************/
-#include "devif.h" /* for DspInterface */
-void Scroll(DspInterface dsp, int newX, int newY);
-void JumpScrollVer(DspInterface dsp, int y);
-void JumpScrollHor(DspInterface dsp, int x);
-void ScrollLeft(DspInterface dsp);
-void ScrollRight(DspInterface dsp);
-void ScrollUp(DspInterface dsp);
-void ScrollDown(DspInterface dsp);
-#endif /* XSCROLL_H */
diff --git a/src/bbtsub.c b/src/bbtsub.c
index d1a22323..f5b1fd33 100644
--- a/src/bbtsub.c
+++ b/src/bbtsub.c
@@ -47,7 +47,7 @@
 #include "address.h"
 #include "arith.h"
 #include "stack.h"
-#include "return.h"
+#include "retmacro.h"
 #include "cell.h"
 
 #include "bbtsubdefs.h"
@@ -60,7 +60,7 @@
 #include "returndefs.h"
 
 #include "bb.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "pilotbbt.h"
 #include "dspdata.h"
 #include "display.h"
diff --git a/src/bitblt.c b/src/bitblt.c
index 087d3930..96de42db 100644
--- a/src/bitblt.c
+++ b/src/bitblt.c
@@ -25,7 +25,7 @@
 
 #include "pilotbbt.h"
 #include "display.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "bb.h"
 
 #include "bitbltdefs.h"
diff --git a/src/chardev.c b/src/chardev.c
index 8fcf0ffb..77625218 100644
--- a/src/chardev.c
+++ b/src/chardev.c
@@ -43,7 +43,6 @@
 #include "arith.h"
 #include "timeout.h"
 #include "locfile.h"
-#include "osmsg.h"
 #include "dbprint.h"
 
 #include "chardevdefs.h"
diff --git a/src/draw.c b/src/draw.c
index 1b5fdacf..0c887281 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -20,7 +20,7 @@
 #include <stddef.h>       // for ptrdiff_t
 #include <stdlib.h>       // for abs
 #include "adr68k.h"       // for NativeAligned2FromLAddr
-#include "bitblt.h"       // for MOUSEXR, MOUSEYH
+#include "bbtmacro.h"       // for MOUSEXR, MOUSEYH
 #include "display.h"      // for DISPLAYBUFFER, DisplayRegion68k, in_display...
 #include "drawdefs.h"     // for N_OP_drawline
 #include "emlglob.h"
diff --git a/src/ether_nethub.c b/src/ether_nethub.c
index e93e19c1..df27eecb 100644
--- a/src/ether_nethub.c
+++ b/src/ether_nethub.c
@@ -31,7 +31,6 @@
 #include "lsptypes.h"
 #include "lspglob.h"
 #include "adr68k.h"
-#include "ether.h"
 #include "dbprint.h"
 #include "etherdefs.h"
 #include "ifpage.h"
diff --git a/src/ether_sunos.c b/src/ether_sunos.c
index d64f0aa8..deb4afea 100644
--- a/src/ether_sunos.c
+++ b/src/ether_sunos.c
@@ -71,7 +71,6 @@
 #include "lsptypes.h"
 #include "lspglob.h"
 #include "adr68k.h"
-#include "ether.h"
 #include "dbprint.h"
 #include "etherdefs.h"
 #include "ifpage.h"
diff --git a/src/hardrtn.c b/src/hardrtn.c
index d4b88e0c..0f57cbfc 100644
--- a/src/hardrtn.c
+++ b/src/hardrtn.c
@@ -32,7 +32,7 @@
 #include "llstkdefs.h"    // for decusecount68k, freestackblock, blt, stack_...
 #include "lspglob.h"
 #include "lsptypes.h"     // for GETWORD
-#include "return.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW, FastRetCALL
+#include "retmacro.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW, FastRetCALL
 #include "stack.h"        // for FX, frameex1, Bframe, CHECK_FX, StackWord
 
 #define MAKE_FXCOPY(fx68k)                                                                   \
diff --git a/src/inet.c b/src/inet.c
index 1526a572..141e75db 100644
--- a/src/inet.c
+++ b/src/inet.c
@@ -41,7 +41,6 @@
 #include "emlglob.h"
 #include "lspglob.h"
 #include "adr68k.h"
-#include "ether.h"
 #include "dbprint.h"
 #include "locfile.h"
 
diff --git a/src/keyevent.c b/src/keyevent.c
index ecc60b37..f2b380bd 100644
--- a/src/keyevent.c
+++ b/src/keyevent.c
@@ -51,7 +51,7 @@ void Mouse_hndlr(void); /* Fields mouse events from driver        */
 #include "lsptypes.h"
 
 #include "bb.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "pilotbbt.h"
 
 #include "keyeventdefs.h"
diff --git a/src/llcolor.c b/src/llcolor.c
index e994b948..e48b9715 100644
--- a/src/llcolor.c
+++ b/src/llcolor.c
@@ -28,7 +28,7 @@
 #include "devconf.h"
 
 #include "bb.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "pilotbbt.h"
 #include "dbprint.h"
 
diff --git a/src/llstk.c b/src/llstk.c
index faf5d9d7..89f79d73 100644
--- a/src/llstk.c
+++ b/src/llstk.c
@@ -33,7 +33,7 @@
 #include "llstkdefs.h"    // for blt, check_BF, check_FX, check_stack_rooms
 #include "lspglob.h"      // for InterfacePage, Stackspace, STACKOVERFLOW_word
 #include "lsptypes.h"     // for GETWORD
-#include "return.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW
+#include "retmacro.h"       // for AFTER_CONTEXTSW, BEFORE_CONTEXTSW
 #include "stack.h"        // for StackWord, Bframe, FX, frameex1, STKWORD
 #include "storagedefs.h"  // for newpage
 // #include "testtooldefs.h" // for print_atomname
diff --git a/src/main.c b/src/main.c
index eb9bcebc..eae25411 100644
--- a/src/main.c
+++ b/src/main.c
@@ -40,7 +40,7 @@
 #include "emlglob.h"
 #include "adr68k.h"
 #include "stack.h"
-#include "return.h"
+#include "retmacro.h"
 
 #include "lispemul.h"
 #include "lspglob.h"
diff --git a/src/osmsg.c b/src/osmsg.c
index 312a30da..6c0b7480 100644
--- a/src/osmsg.c
+++ b/src/osmsg.c
@@ -44,7 +44,7 @@
 #include "lspglob.h"
 #include "timeout.h"
 #include "locfile.h"
-#include "osmsg.h"
+#include "osmsgprint.h"
 #include "dbprint.h"
 
 #include "commondefs.h"
diff --git a/src/perrno.c b/src/perrno.c
index b2ed83fa..a7c8b477 100644
--- a/src/perrno.c
+++ b/src/perrno.c
@@ -13,7 +13,7 @@
 #include <errno.h>       // for errno
 #include <stdio.h>       // for fprintf, perror, stderr, NULL
 #include <string.h>      // for strerror
-#include "osmsg.h"       // for OSMESSAGE_PRINT
+#include "osmsgprint.h"  // for OSMESSAGE_PRINT
 #include "perrnodefs.h"  // for err_mess, perrorn
 
 /************************************************************************/
diff --git a/src/rawcolor.c b/src/rawcolor.c
index 2850e7d9..f2bc3c82 100644
--- a/src/rawcolor.c
+++ b/src/rawcolor.c
@@ -31,7 +31,7 @@
 #include "pilotbbt.h"
 #include "debug.h"
 #include "arith.h"
-#include "bitblt.h"
+#include "bbtmacro.h"
 #include "lldsp.h"
 #include "bbtsubdefs.h"
 
diff --git a/src/return.c b/src/return.c
index fe87cf6c..016c75a8 100644
--- a/src/return.c
+++ b/src/return.c
@@ -38,7 +38,7 @@
 #include "lspglob.h"
 #include "initatms.h"
 #include "cell.h"
-#include "return.h"
+#include "retmacro.h"
 #include "testtooldefs.h"
 #include "returndefs.h"
 #include "commondefs.h"
diff --git a/src/tty.c b/src/tty.c
index e628cfd5..2e4b242c 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -22,9 +22,60 @@
 #include "lsptypes.h"
 #include "lspglob.h"
 #include "commondefs.h"
-#include "tty.h"
 #include "ttydefs.h"
 
+/* TTY Commands and structures for communicating with Lisp */
+
+#define TTY_GET_STATUS     33280>>8
+#define TTY_ON             33536>>8
+#define TTY_OFF            33792>>8
+#define TTY_BREAK_ON       34304>>8
+#define TTY_BREAK_OFF      34560>>8
+#define PUT_CHAR             128
+#define ABORT_PUT            133
+#define SET_PARAM            129
+#define SET_DSR            33025
+#define SET_CTS            33026
+#define SET_CHAR_LENGTH    33028
+#define SET_PARITY         33032
+#define SET_STOP_BITS      33040
+#define SET_BAUD_RATE      33056
+#define SET_ALL_PARAMETERS 33087
+
+typedef struct {
+	unsigned command             : 8;
+	unsigned outdata             : 8;
+} DLTTY_OUT_COMMAND;
+
+typedef struct {
+	unsigned on_off              : 4;
+	unsigned line_speed          : 4;
+	unsigned stop_bits           : 2;
+	unsigned parity              : 2;
+	unsigned char_length         : 2;
+	unsigned clear_to_send       : 1;
+	unsigned data_set_ready      : 1;
+	DLword  notify_mask;
+} DLTTY_OUT_CSB;
+
+typedef struct {
+	unsigned state               : 1;
+	unsigned nil1                : 7;
+	unsigned success             : 1;
+	unsigned break_detected      : 1;
+	unsigned framing_error       : 1;
+	unsigned data_lost           : 1;
+	unsigned parity_error        : 1;
+	unsigned nil2                : 2;
+	unsigned not_ready           : 1;
+	char     in_data;
+	unsigned data_terminal_ready : 1;
+	unsigned nil3                : 4;
+	unsigned request_to_send     : 1;
+	unsigned rx_ready            : 1;
+	unsigned tx_ready            : 1;
+} DLTTY_IN_CSB;
+
 static DLTTY_OUT_COMMAND *DLTTYPortCmd;
 static DLTTY_IN_CSB *DLTTYIn;
 static DLTTY_OUT_CSB *DLTTYOut;
diff --git a/src/uutils.c b/src/uutils.c
index e011229a..e49e998d 100644
--- a/src/uutils.c
+++ b/src/uutils.c
@@ -32,7 +32,7 @@
 #include "lispemul.h"    // for LispPTR, DLword, NIL, ATOM_T
 #include "lspglob.h"
 #include "lsptypes.h"    // for GETWORD, OneDArray, GetTypeNumber, THIN_CHAR...
-#include "osmsg.h"       // for OSMESSAGE_PRINT
+#include "osmsgprint.h"  // for OSMESSAGE_PRINT
 #include "uraiddefs.h"   // for device_after_raid, device_before_raid
 #include "uutilsdefs.h"  // for c_string_to_lisp_string, check_unix_password
 
diff --git a/src/vmemsave.c b/src/vmemsave.c
index 3ea6f09f..0ccd58a5 100644
--- a/src/vmemsave.c
+++ b/src/vmemsave.c
@@ -41,7 +41,6 @@
 #include "lispemul.h"
 #include "lispmap.h"
 #include "lspglob.h"
-#include "vmemsave.h"
 #include "timeout.h"
 #include "adr68k.h"
 #include "lsptypes.h"
@@ -58,6 +57,12 @@
 #include "perrnodefs.h"
 #include "ufsdefs.h"
 
+/* Definitions incorporated from vmemsave.h (removed) */
+#define	FP_IFPAGE  512			/* IFPAGE address in sysoutfile by Byte */
+#define	DOMINOPAGES  301		/* skip dominopages  in  fptovp */
+#define	SKIPPAGES  301			/* save first filepage  */
+#define	SKIP_DOMINOPAGES  153600	/* Byte size in sysoutfile for dominocode */
+#define	SAVE_IFPAGE	223		/* Virtual address for IFPAGES's buffer page. This value is \EMUSWAPBUFFERS in lisp. */
 
 /* Error return values from VMEMSAVE */
 #define COMPLETESYSOUT NIL
diff --git a/src/xc.c b/src/xc.c
index 907b16b2..52748a93 100644
--- a/src/xc.c
+++ b/src/xc.c
@@ -41,7 +41,7 @@
 #include "address.h"
 #include "adr68k.h"
 #include "stack.h"
-#include "return.h"
+#include "retmacro.h"
 #include "dbprint.h"
 
 #include "lspglob.h"