diff --git a/mach/proto/mcg/basicblock.h b/mach/proto/mcg/basicblock.h
index 7fb654a6d..7935c9ede 100644
--- a/mach/proto/mcg/basicblock.h
+++ b/mach/proto/mcg/basicblock.h
@@ -25,3 +25,5 @@ extern void bb_alias(struct basicblock* block, const char* name);
 
 #endif
 
+/* vim: set sw=4 ts=4 expandtab : */
+
diff --git a/mach/proto/mcg/hop.c b/mach/proto/mcg/hop.c
index e4552e04e..a11b99792 100644
--- a/mach/proto/mcg/hop.c
+++ b/mach/proto/mcg/hop.c
@@ -106,3 +106,5 @@ void hop_print(char k, struct hop* hop)
 		tracef(k, "\n", k);
 }
 
+/* vim: set sw=4 ts=4 expandtab : */
+
diff --git a/mach/proto/mcg/hop.h b/mach/proto/mcg/hop.h
index 3e2f9d6e7..d802ed01a 100644
--- a/mach/proto/mcg/hop.h
+++ b/mach/proto/mcg/hop.h
@@ -28,6 +28,7 @@ struct hop
 	struct ir* ir;
 	ARRAYOF(struct insel) insels;
 	struct vreg* output;
+	PMAPOF(struct vreg, struct hreg) registers;
 };
 
 extern struct hop* new_hop(int insn_no, struct ir* ir);
@@ -41,3 +42,5 @@ extern void hop_print(char k, struct hop* hop);
 
 #endif
 
+/* vim: set sw=4 ts=4 expandtab : */
+
diff --git a/mach/proto/mcg/ir.h b/mach/proto/mcg/ir.h
index a7920b512..a12b9642c 100644
--- a/mach/proto/mcg/ir.h
+++ b/mach/proto/mcg/ir.h
@@ -46,3 +46,4 @@ extern void ir_print(char k, const struct ir* ir);
 
 #endif
 
+/* vim: set sw=4 ts=4 expandtab : */
diff --git a/mach/proto/mcg/mcgg_generated_footer.h b/mach/proto/mcg/mcgg_generated_footer.h
index 11b40205a..6de0c5277 100644
--- a/mach/proto/mcg/mcgg_generated_footer.h
+++ b/mach/proto/mcg/mcgg_generated_footer.h
@@ -51,3 +51,5 @@ int main(void) {
 }
 #endif
 
+/* vim: set sw=4 ts=4 expandtab : */
+
diff --git a/mach/proto/mcg/mcgg_generated_header.h b/mach/proto/mcg/mcgg_generated_header.h
index f190a9867..8ca4c4b34 100644
--- a/mach/proto/mcg/mcgg_generated_header.h
+++ b/mach/proto/mcg/mcgg_generated_header.h
@@ -8,3 +8,5 @@
 
 extern void burm_panic_cannot_match(NODEPTR_TYPE node);
 
+/* vim: set sw=4 ts=4 expandtab : */
+
diff --git a/mach/proto/mcg/registerallocator.c b/mach/proto/mcg/registerallocator.c
new file mode 100644
index 000000000..84db0ea7d
--- /dev/null
+++ b/mach/proto/mcg/registerallocator.c
@@ -0,0 +1,2 @@
+/* vim: set sw=4 ts=4 expandtab : */
+
diff --git a/mach/proto/mcg/symbol.c b/mach/proto/mcg/symbol.c
index 6012b91f3..26e01e020 100644
--- a/mach/proto/mcg/symbol.c
+++ b/mach/proto/mcg/symbol.c
@@ -58,3 +58,5 @@ struct symbol* symbol_walk(symbol_walker_t* cb, void* user)
 	return NULL;
 }
 
+/* vim: set sw=4 ts=4 expandtab : */
+
diff --git a/mach/proto/mcg/table b/mach/proto/mcg/table
index 8ff3b2416..8ab4a4d51 100644
--- a/mach/proto/mcg/table
+++ b/mach/proto/mcg/table
@@ -256,3 +256,5 @@ PATTERNS
 		emit "fadds %reg, %left, %right"
 		cost 4;
 
+/* vim: set sw=4 ts=4 expandtab : */
+