diff --git a/Makefile.mk b/Makefile.mk
index 70bd014..cc91605 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -24,7 +24,9 @@ AFPMOUNTER_OBJS = cdevstart.o afpcdev.o afpurlparser.o afpoptions.o strncasecmp.
 AFPMOUNTER_RSRC = afpcdev.rez
 AFPMOUNTER_CDEV = AFPMounter
 
-PROGS = $(DSITEST_PROG) $(MOUNTAFP_PROG) $(DUMPCMDTBL_PROG) $(AFPBRIDGE_PROG) $(AFPMOUNTER_CDEV)
+MACROS = asmglue.macros cmdproc.macros
+
+PROGS = $(AFPBRIDGE_PROG) $(AFPMOUNTER_CDEV) $(DSITEST_PROG) $(MOUNTAFP_PROG) $(DUMPCMDTBL_PROG) $(LISTSESSIONS_PROG)
 
 .PHONY: default
 default: $(PROGS)
@@ -54,7 +56,7 @@ $(AFPMOUNTER_CDEV): $(AFPMOUNTER_CDEV).obj $(AFPMOUNTER_RSRC)
 	chtyp -tcdv $@
 
 %.macros: %.asm
-	macgen $< $@ /lang/orca/Libraries/ORCAInclude/m16.*
+	macgen $< $@ /lang/orca/Libraries/ORCAInclude/m16.* > .null
 
 .PHONY: install
 install: $(AFPBRIDGE_PROG) $(AFPMOUNTER_CDEV)
@@ -62,13 +64,17 @@ install: $(AFPBRIDGE_PROG) $(AFPMOUNTER_CDEV)
 	cp $(AFPMOUNTER_CDEV) "*/System/CDevs"
 	$(RM) "*/System/CDevs/CDev.Data" > .null
 
-.PHONY: import
-import:
-	chtyp -ttxt *.mk
+.PHONY: chtyp
+chtyp:
+	chtyp -ttxt *.mk *.md *.txt
 	chtyp -lcc *.c *.h
 	chtyp -lasm *.asm *.macros
 	chtyp -lrez *.rez
+
+.PHONY: import
+import: chtyp
 	udl -g *
+	dmake $(MACROS)
 
 .PHONY: clean
 clean:
diff --git a/asmglue.macros b/asmglue.macros
deleted file mode 100644
index bd531fa..0000000
--- a/asmglue.macros
+++ /dev/null
@@ -1,40 +0,0 @@
- macro
-&l long &a,&b
- lclb &i
- lclb &m
-&a amid &a,1,1
-&m setb ("&a"="M").or.("&a"="m")
-&i setb ("&a"="I").or.("&a"="i")
- aif c:&b=0,.a
-&b amid &b,1,1
-&m setb ("&b"="M").or.("&b"="m").or.&m
-&i setb ("&b"="I").or.("&b"="i").or.&i
-.a
-&l rep #&m*32+&i*16
- aif .not.&m,.b
- longa on
-.b
- aif .not.&i,.c
- longi on
-.c
- mend
- macro
-&l short &a,&b
- lclb &i
- lclb &m
-&a amid &a,1,1
-&m setb ("&a"="M").or.("&a"="m")
-&i setb ("&a"="I").or.("&a"="i")
- aif c:&b=0,.a
-&b amid &b,1,1
-&m setb ("&b"="M").or.("&b"="m").or.&m
-&i setb ("&b"="I").or.("&b"="i").or.&i
-.a
-&l sep #&m*32+&i*16
- aif .not.&m,.b
- longa off
-.b
- aif .not.&i,.c
- longi off
-.c
- mend
diff --git a/cmdproc.macros b/cmdproc.macros
deleted file mode 100644
index bd531fa..0000000
--- a/cmdproc.macros
+++ /dev/null
@@ -1,40 +0,0 @@
- macro
-&l long &a,&b
- lclb &i
- lclb &m
-&a amid &a,1,1
-&m setb ("&a"="M").or.("&a"="m")
-&i setb ("&a"="I").or.("&a"="i")
- aif c:&b=0,.a
-&b amid &b,1,1
-&m setb ("&b"="M").or.("&b"="m").or.&m
-&i setb ("&b"="I").or.("&b"="i").or.&i
-.a
-&l rep #&m*32+&i*16
- aif .not.&m,.b
- longa on
-.b
- aif .not.&i,.c
- longi on
-.c
- mend
- macro
-&l short &a,&b
- lclb &i
- lclb &m
-&a amid &a,1,1
-&m setb ("&a"="M").or.("&a"="m")
-&i setb ("&a"="I").or.("&a"="i")
- aif c:&b=0,.a
-&b amid &b,1,1
-&m setb ("&b"="M").or.("&b"="m").or.&m
-&i setb ("&b"="I").or.("&b"="i").or.&i
-.a
-&l sep #&m*32+&i*16
- aif .not.&m,.b
- longa off
-.b
- aif .not.&i,.c
- longi off
-.c
- mend