diff --git a/mps/qa/test/testlib/epvmfmt.c b/mps/qa/test/testlib/epvmfmt.c
index 8db2b5a37c0..19edf39f6a3 100644
--- a/mps/qa/test/testlib/epvmfmt.c
+++ b/mps/qa/test/testlib/epvmfmt.c
@@ -1,5 +1,4 @@
-/* $HopeName$
-epvmfmt.c
+/* $HopeName: MMQA_harness!testlib:epvmfmt.c(trunk.3) $
 */
 
 #include "mps.h"
@@ -12,6 +11,13 @@ int alloccomments = 0;
 /* the scanning function doesn't try to fix null refs
 */
 
+static mps_res_t epvmscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit);
+static mps_addr_t epvmskip(mps_addr_t object);
+static void epvmfwd(mps_addr_t object, mps_addr_t to);
+static mps_addr_t epvmisfwd(mps_addr_t object);
+static void epvmcopy(mps_addr_t object, mps_addr_t to);
+static void epvmpad(mps_addr_t base, size_t size);
+
 static mps_res_t epvmscan(mps_ss_t ss, mps_addr_t base, mps_addr_t limit);
 
 mps_addr_t epvmskip(mps_addr_t object) {
diff --git a/mps/qa/test/testlib/rankfmt.h b/mps/qa/test/testlib/rankfmt.h
index 06be1549981..ceb925ef932 100644
--- a/mps/qa/test/testlib/rankfmt.h
+++ b/mps/qa/test/testlib/rankfmt.h
@@ -1,5 +1,5 @@
-/* $HopeName$
-rankfmt.h
+/* $HopeName: MMQA_harness!testlib:rankfmt.h(trunk.3) $
+
    Format like exfmt but with rank-checking built in.
    This format will work without register roots, but to use it,
    you must take precautions. You must register exfmt_root as
@@ -103,8 +103,8 @@ extern struct mps_fmt_A_s fmtA;
 mycell *allocone(mps_ap_t ap, int size, mps_rank_t rank);
 mycell *allocdumb(mps_ap_t ap, size_t bytes, mps_rank_t rank);
 
-mps_res_t allocrone(mps_addr_t addr, mps_ap_t ap, int size, mps_rank_t rank);
-mps_res_t allocrdumb(mps_addr_t addr, mps_ap_t ap,
+mps_res_t allocrone(mps_addr_t *addr, mps_ap_t ap, int size, mps_rank_t rank);
+mps_res_t allocrdumb(mps_addr_t *addr, mps_ap_t ap,
                      size_t bytes, mps_rank_t rank);
 
 mps_addr_t getdata(mycell *obj);