diff --git a/mach/vax4/libem/adf.s b/mach/vax4/libem/adf.s
index 56cf9c69..9bc407a4 100644
--- a/mach/vax4/libem/adf.s
+++ b/mach/vax4/libem/adf.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl	.adf
 
 .adf:
diff --git a/mach/vax4/libem/adi.s b/mach/vax4/libem/adi.s
index 8956e33b..509e68b0 100644
--- a/mach/vax4/libem/adi.s
+++ b/mach/vax4/libem/adi.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .adi
 
 .adi:
diff --git a/mach/vax4/libem/ass.s b/mach/vax4/libem/ass.s
index d4ecf43e..37a7a771 100644
--- a/mach/vax4/libem/ass.s
+++ b/mach/vax4/libem/ass.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .ass
 
 .ass:
diff --git a/mach/vax4/libem/bls.s b/mach/vax4/libem/bls.s
index fee96283..ded68fe9 100644
--- a/mach/vax4/libem/bls.s
+++ b/mach/vax4/libem/bls.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .bls
 
 .bls:
diff --git a/mach/vax4/libem/cff.s b/mach/vax4/libem/cff.s
index 9ec1cdaa..ee75d9fe 100644
--- a/mach/vax4/libem/cff.s
+++ b/mach/vax4/libem/cff.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .cff
 
 .cff:
diff --git a/mach/vax4/libem/cfi.s b/mach/vax4/libem/cfi.s
index 6d516fc0..c89c0ced 100644
--- a/mach/vax4/libem/cfi.s
+++ b/mach/vax4/libem/cfi.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl  .cfi
 
 .cfi:
diff --git a/mach/vax4/libem/cfu.s b/mach/vax4/libem/cfu.s
index 880b365c..b761293d 100644
--- a/mach/vax4/libem/cfu.s
+++ b/mach/vax4/libem/cfu.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .cfu
 
 .cfu:
diff --git a/mach/vax4/libem/cif.s b/mach/vax4/libem/cif.s
index 9533b158..65c0e75f 100644
--- a/mach/vax4/libem/cif.s
+++ b/mach/vax4/libem/cif.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl  .cif
 
 .cif:
diff --git a/mach/vax4/libem/cii.s b/mach/vax4/libem/cii.s
index b86db55a..6a39061f 100644
--- a/mach/vax4/libem/cii.s
+++ b/mach/vax4/libem/cii.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl  .cii
 
 .cii:
diff --git a/mach/vax4/libem/cmf.s b/mach/vax4/libem/cmf.s
index 06464117..110b5753 100644
--- a/mach/vax4/libem/cmf.s
+++ b/mach/vax4/libem/cmf.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .cmf
 
 .cmf:
diff --git a/mach/vax4/libem/cmi.s b/mach/vax4/libem/cmi.s
index 81b09731..c730675a 100644
--- a/mach/vax4/libem/cmi.s
+++ b/mach/vax4/libem/cmi.s
@@ -1,12 +1,13 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .cmi
 
 .cmi:
 	movl    (sp)+,r1
 	cmpl    r0,$4
-	bneq    err
+	bneq    Lerr
 	clrl    r0
 	cmpl    (sp)+,(sp)+
 	beql    L1
@@ -17,6 +18,6 @@ L2:
 	decl    r0
 L1:
 	jmp     (r1)
-err:
+Lerr:
 	pushl	$EILLINS
 	jmp     .fat
diff --git a/mach/vax4/libem/cmu.s b/mach/vax4/libem/cmu.s
index 88554d1a..c30ecfd8 100644
--- a/mach/vax4/libem/cmu.s
+++ b/mach/vax4/libem/cmu.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .cmu
 
 .cmu:
diff --git a/mach/vax4/libem/csa4.s b/mach/vax4/libem/csa4.s
index 1a853591..293e6752 100644
--- a/mach/vax4/libem/csa4.s
+++ b/mach/vax4/libem/csa4.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl  .csa4
 
 .csa4:
diff --git a/mach/vax4/libem/csb4.s b/mach/vax4/libem/csb4.s
index f5e8c5d9..eb49a7c8 100644
--- a/mach/vax4/libem/csb4.s
+++ b/mach/vax4/libem/csb4.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl  .csb4
 
 .csb4:
diff --git a/mach/vax4/libem/csx.s b/mach/vax4/libem/csx.s
index 442a2a40..1a6266a5 100644
--- a/mach/vax4/libem/csx.s
+++ b/mach/vax4/libem/csx.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .csa
 
 .csa:
diff --git a/mach/vax4/libem/cuf.s b/mach/vax4/libem/cuf.s
index bc673ca7..d04bd0d8 100644
--- a/mach/vax4/libem/cuf.s
+++ b/mach/vax4/libem/cuf.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .cuf
 
 .cuf:
diff --git a/mach/vax4/libem/cui.s b/mach/vax4/libem/cui.s
index 1fb06b81..8d2f35f0 100644
--- a/mach/vax4/libem/cui.s
+++ b/mach/vax4/libem/cui.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .cui
 
 .cui:
diff --git a/mach/vax4/libem/cuu.s b/mach/vax4/libem/cuu.s
index da466251..14931e22 100644
--- a/mach/vax4/libem/cuu.s
+++ b/mach/vax4/libem/cuu.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .cuu
 
 .cuu:
diff --git a/mach/vax4/libem/dus.s b/mach/vax4/libem/dus.s
index e3fd7b8b..17b99114 100644
--- a/mach/vax4/libem/dus.s
+++ b/mach/vax4/libem/dus.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .dus
 
 .dus:
diff --git a/mach/vax4/libem/dvf.s b/mach/vax4/libem/dvf.s
index b4917ffe..da3a65b1 100644
--- a/mach/vax4/libem/dvf.s
+++ b/mach/vax4/libem/dvf.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl	.dvf
 
 .dvf:
diff --git a/mach/vax4/libem/dvi.s b/mach/vax4/libem/dvi.s
index d64ae995..ab92213d 100644
--- a/mach/vax4/libem/dvi.s
+++ b/mach/vax4/libem/dvi.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .dvi
 
 .dvi:
diff --git a/mach/vax4/libem/dvu.s b/mach/vax4/libem/dvu.s
index 800860f0..7e8555d2 100644
--- a/mach/vax4/libem/dvu.s
+++ b/mach/vax4/libem/dvu.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .dvu
 
 .dvu:
diff --git a/mach/vax4/libem/dvu4.s b/mach/vax4/libem/dvu4.s
index 0fdf1374..000d4467 100644
--- a/mach/vax4/libem/dvu4.s
+++ b/mach/vax4/libem/dvu4.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl  .dvu4
 
 .dvu4:
diff --git a/mach/vax4/libem/fef.s b/mach/vax4/libem/fef.s
index 6c7cba01..59daf154 100644
--- a/mach/vax4/libem/fef.s
+++ b/mach/vax4/libem/fef.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl	.fef
 
 .fef:
diff --git a/mach/vax4/libem/fif.s b/mach/vax4/libem/fif.s
index fc56abeb..d1c3f1f9 100644
--- a/mach/vax4/libem/fif.s
+++ b/mach/vax4/libem/fif.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl	.fif
 
 .fif:
diff --git a/mach/vax4/libem/gto.s b/mach/vax4/libem/gto.s
index 98b312df..85cd56fe 100644
--- a/mach/vax4/libem/gto.s
+++ b/mach/vax4/libem/gto.s
@@ -1,5 +1,4 @@
         # $Header$
-#include "em_abs.h"
 
 .globl	.strlb
 .globl	.gto
diff --git a/mach/vax4/libem/los.s b/mach/vax4/libem/los.s
index 63148c56..fa0a4330 100644
--- a/mach/vax4/libem/los.s
+++ b/mach/vax4/libem/los.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .los
 
 .los:
diff --git a/mach/vax4/libem/mlf.s b/mach/vax4/libem/mlf.s
index f1593dc6..e6061960 100644
--- a/mach/vax4/libem/mlf.s
+++ b/mach/vax4/libem/mlf.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl	.mlf
 
 .mlf:
diff --git a/mach/vax4/libem/mli.s b/mach/vax4/libem/mli.s
index e0b918bb..cf03e0e9 100644
--- a/mach/vax4/libem/mli.s
+++ b/mach/vax4/libem/mli.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .mli
 
 .mli:
diff --git a/mach/vax4/libem/mon.s b/mach/vax4/libem/mon.s
index b9b3bf5a..dbb74cb4 100644
--- a/mach/vax4/libem/mon.s
+++ b/mach/vax4/libem/mon.s
@@ -1,9 +1,10 @@
-        # $Header$
 #include "system.h"
 #include "em_abs.h"
 #define MOVL	movl	(sp)+,(ap)+
 #define MOVQ	movq	(sp)+,(ap)+
 
+        # $Header$
+
 .set sigvec,108
 
 .globl .mon
diff --git a/mach/vax4/libem/ngf.s b/mach/vax4/libem/ngf.s
index 7f33f9dd..667a096b 100644
--- a/mach/vax4/libem/ngf.s
+++ b/mach/vax4/libem/ngf.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl	.ngf
 
 .ngf:
diff --git a/mach/vax4/libem/ngi.s b/mach/vax4/libem/ngi.s
index a43439cf..271e6363 100644
--- a/mach/vax4/libem/ngi.s
+++ b/mach/vax4/libem/ngi.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .ngi
 
 .ngi:
diff --git a/mach/vax4/libem/nop.s b/mach/vax4/libem/nop.s
index 8eb821b2..2e7cb6d4 100644
--- a/mach/vax4/libem/nop.s
+++ b/mach/vax4/libem/nop.s
@@ -1,5 +1,7 @@
-        # $Header$
 #include "em_abs.h"
+
+        # $Header$
+
 .globl  .nop
 
 .nop:
diff --git a/mach/vax4/libem/rck.s b/mach/vax4/libem/rck.s
index c3dd53d0..dc39d4df 100644
--- a/mach/vax4/libem/rck.s
+++ b/mach/vax4/libem/rck.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .rck
 
 .rck:
diff --git a/mach/vax4/libem/rck4.s b/mach/vax4/libem/rck4.s
index 874fb387..93305fa6 100644
--- a/mach/vax4/libem/rck4.s
+++ b/mach/vax4/libem/rck4.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .rck4
 
 .rck4:
diff --git a/mach/vax4/libem/rmi.s b/mach/vax4/libem/rmi.s
index c2bbd091..66fa4569 100644
--- a/mach/vax4/libem/rmi.s
+++ b/mach/vax4/libem/rmi.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .rmi
 
 .rmi:
diff --git a/mach/vax4/libem/rmu.s b/mach/vax4/libem/rmu.s
index dd7130d4..3054f87e 100644
--- a/mach/vax4/libem/rmu.s
+++ b/mach/vax4/libem/rmu.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .rmu
 
 .rmu:
diff --git a/mach/vax4/libem/rol.s b/mach/vax4/libem/rol.s
index 6816cf26..ec55edcf 100644
--- a/mach/vax4/libem/rol.s
+++ b/mach/vax4/libem/rol.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .rol
 
 .rol:
diff --git a/mach/vax4/libem/ror.s b/mach/vax4/libem/ror.s
index 8a1c1a6b..f8697311 100644
--- a/mach/vax4/libem/ror.s
+++ b/mach/vax4/libem/ror.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .ror
 
 .ror:
diff --git a/mach/vax4/libem/sbf.s b/mach/vax4/libem/sbf.s
index d886a6d2..9c317f84 100644
--- a/mach/vax4/libem/sbf.s
+++ b/mach/vax4/libem/sbf.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl	.sbf
 
 .sbf:
diff --git a/mach/vax4/libem/sbi.s b/mach/vax4/libem/sbi.s
index 5887e2a1..acad0ea3 100644
--- a/mach/vax4/libem/sbi.s
+++ b/mach/vax4/libem/sbi.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .sbi
 
 .sbi:
diff --git a/mach/vax4/libem/set.s b/mach/vax4/libem/set.s
index 77f9370a..c1ba16af 100644
--- a/mach/vax4/libem/set.s
+++ b/mach/vax4/libem/set.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl	.setx
 
 	# bytes in r0
diff --git a/mach/vax4/libem/sli.s b/mach/vax4/libem/sli.s
index 4c2fcd14..9f29a5f4 100644
--- a/mach/vax4/libem/sli.s
+++ b/mach/vax4/libem/sli.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .sli
 
 .sli:
diff --git a/mach/vax4/libem/sri.s b/mach/vax4/libem/sri.s
index d1d7de7f..7144701d 100644
--- a/mach/vax4/libem/sri.s
+++ b/mach/vax4/libem/sri.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .sri
 
 .sri:
diff --git a/mach/vax4/libem/sru.s b/mach/vax4/libem/sru.s
index 035690af..4c7c2f2b 100644
--- a/mach/vax4/libem/sru.s
+++ b/mach/vax4/libem/sru.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .sru
 
 .sru:
diff --git a/mach/vax4/libem/strhp.s b/mach/vax4/libem/strhp.s
index 2d68119e..8da69356 100644
--- a/mach/vax4/libem/strhp.s
+++ b/mach/vax4/libem/strhp.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl  .strhp
 
 .strhp:
diff --git a/mach/vax4/libem/sts.s b/mach/vax4/libem/sts.s
index ddf01dc8..3219a3c8 100644
--- a/mach/vax4/libem/sts.s
+++ b/mach/vax4/libem/sts.s
@@ -1,6 +1,7 @@
-        # $Header$
 #include "em_abs.h"
 
+        # $Header$
+
 .globl .sts
 
 .sts:
diff --git a/mach/vax4/libem/xar.s b/mach/vax4/libem/xar.s
index 5e55be7f..431f0462 100644
--- a/mach/vax4/libem/xar.s
+++ b/mach/vax4/libem/xar.s
@@ -1,5 +1,7 @@
-        # $Header$
 #include "em_abs.h"
+
+        # $Header$
+
 .globl  .lar
 
 .lar: