diff --git a/mps/qa/test/testlib/arg.h b/mps/qa/test/testlib/arg.h
index eae554f6607..ed35120d8a4 100644
--- a/mps/qa/test/testlib/arg.h
+++ b/mps/qa/test/testlib/arg.h
@@ -1,4 +1,4 @@
-/* $HopeName$
+/* $HopeName: MMQA_harness!testlib:arg.h(trunk.2) $
 arg.h
    useful things for arg-err tests
 */
@@ -6,7 +6,7 @@ arg.h
 #ifndef arg_h
 #define arg_h
 
-#include "mps.h"
+#include "testlib.h"
 
 #define UNALIGNED ((mps_addr_t) (((char *) NULL) + 1))
 
diff --git a/mps/qa/test/testlib/awlfmt.c b/mps/qa/test/testlib/awlfmt.c
index e5914edb8e0..9092618959e 100644
--- a/mps/qa/test/testlib/awlfmt.c
+++ b/mps/qa/test/testlib/awlfmt.c
@@ -1,10 +1,8 @@
-/* $HopeName$
+/* $HopeName: MMQA_harness!testlib:awlfmt.c(trunk.4) $
 awlfmt.c
    A format simlar to newfmt, but for the awl pool
 */
 
-#include "mps.h"
-#include "testlib.h"
 #include "awlfmt.h"
 #include <string.h>
 
diff --git a/mps/qa/test/testlib/awlfmt.h b/mps/qa/test/testlib/awlfmt.h
index 18ab2d4d5c1..7a3c4f40c23 100644
--- a/mps/qa/test/testlib/awlfmt.h
+++ b/mps/qa/test/testlib/awlfmt.h
@@ -1,4 +1,4 @@
-/* $HopeName$
+/* $HopeName: MMQA_harness!testlib:awlfmt.h(trunk.2) $
 awlfmt.h
    A format for the awl pool
 */
@@ -6,7 +6,7 @@ awlfmt.h
 #ifndef awlfmt_h
 #define awlfmt_h
 
-#include "mps.h"
+#include "testlib.h"
 
 extern int formatcomments;
 extern int checkcomments;
diff --git a/mps/qa/test/testlib/epvmfmt.c b/mps/qa/test/testlib/epvmfmt.c
index 76a5487ae08..66601ec57f1 100644
--- a/mps/qa/test/testlib/epvmfmt.c
+++ b/mps/qa/test/testlib/epvmfmt.c
@@ -1,8 +1,6 @@
-/* $HopeName: MMQA_harness!testlib:epvmfmt.c(trunk.5) $
+/* $HopeName: MMQA_harness!testlib:epvmfmt.c(trunk.6) $
 */
 
-#include "mps.h"
-#include "testlib.h"
 #include "epvmfmt.h"
 #include <string.h>
 
diff --git a/mps/qa/test/testlib/epvmfmt.h b/mps/qa/test/testlib/epvmfmt.h
index 1fe5c189514..893227e4100 100644
--- a/mps/qa/test/testlib/epvmfmt.h
+++ b/mps/qa/test/testlib/epvmfmt.h
@@ -1,4 +1,4 @@
-/* $HopeName: MMQA_harness!testlib:epvmfmt.h(trunk.3) $
+/* $HopeName: MMQA_harness!testlib:epvmfmt.h(trunk.4) $
 epvmfmt.h
    Format for objects in the EPVM pool.
 */
@@ -6,7 +6,7 @@ epvmfmt.h
 #ifndef epvmfmt_h
 #define epvmfmt_h
 
-#include "mps.h"
+#include "testlib.h"
 
 extern int alloccomments;
 
diff --git a/mps/qa/test/testlib/exfmt.c b/mps/qa/test/testlib/exfmt.c
index ca6670d30f3..f073fa22461 100644
--- a/mps/qa/test/testlib/exfmt.c
+++ b/mps/qa/test/testlib/exfmt.c
@@ -1,11 +1,9 @@
-/* $HopeName$
+/* $HopeName: MMQA_harness!testlib:exfmt.c(trunk.4) $
 exfmt.c
    A format for the awl and amc pools which can cope with exact references
    See comments in header file for usage.
 */
 
-#include "mps.h"
-#include "testlib.h"
 #include "exfmt.h"
 #include <string.h>
 
diff --git a/mps/qa/test/testlib/exfmt.h b/mps/qa/test/testlib/exfmt.h
index 0a1a6d31ce8..3c1a69ac725 100644
--- a/mps/qa/test/testlib/exfmt.h
+++ b/mps/qa/test/testlib/exfmt.h
@@ -1,4 +1,4 @@
-/* $HopeName$
+/* $HopeName: MMQA_harness!testlib:exfmt.h(trunk.3) $
 exfmt.h
    A format for the awl and amc pools, which will work without
    register roots. To use it, you must take precautions. You must
@@ -15,7 +15,7 @@ exfmt.h
 #ifndef exfmt_h
 #define exfmt_h
 
-#include "mps.h"
+#include "testlib.h"
 
 extern int formatcomments;
 extern int checkcomments;
diff --git a/mps/qa/test/testlib/fastfmt.c b/mps/qa/test/testlib/fastfmt.c
index 86bb399f3d5..908c5ecca93 100644
--- a/mps/qa/test/testlib/fastfmt.c
+++ b/mps/qa/test/testlib/fastfmt.c
@@ -1,10 +1,8 @@
-/* $HopeName$
+/* $HopeName: MMQA_harness!testlib:fastfmt.c(trunk.3) $
 fastfmt.c
    See comments in header file for usage.
 */
 
-#include "mps.h"
-#include "testlib.h"
 #include "fastfmt.h"
 #include <string.h>
 
diff --git a/mps/qa/test/testlib/fastfmt.h b/mps/qa/test/testlib/fastfmt.h
index 6a075ba3fb7..85112f21ba0 100644
--- a/mps/qa/test/testlib/fastfmt.h
+++ b/mps/qa/test/testlib/fastfmt.h
@@ -1,4 +1,4 @@
-/* $HopeName$
+/* $HopeName: MMQA_harness!testlib:fastfmt.h(trunk.2) $
 fastfmt.h
    Format like rankfmt (see rankfmt.h) and with same object
    structure, but with no checking or comments.
@@ -8,7 +8,7 @@ fastfmt.h
 #ifndef fastfmt_h
 #define fastfmt_h
 
-#include "mps.h"
+#include "testlib.h"
 
 extern mps_addr_t exfmt_root;
 
diff --git a/mps/qa/test/testlib/lofmt.c b/mps/qa/test/testlib/lofmt.c
index 2ac64851831..1fac9ed5a03 100644
--- a/mps/qa/test/testlib/lofmt.c
+++ b/mps/qa/test/testlib/lofmt.c
@@ -1,10 +1,8 @@
-/* $HopeName$
+/* $HopeName: MMQA_harness!testlib:lofmt.c(trunk.3) $
 lofmt.c
    A format for pool class LO
 */
 
-#include "mps.h"
-#include "testlib.h"
 #include "lofmt.h"
 #include <string.h>
 
diff --git a/mps/qa/test/testlib/lofmt.h b/mps/qa/test/testlib/lofmt.h
index 5b29a440652..2663b43884c 100644
--- a/mps/qa/test/testlib/lofmt.h
+++ b/mps/qa/test/testlib/lofmt.h
@@ -1,4 +1,4 @@
-/* $HopeName$
+/* $HopeName: MMQA_harness!testlib:lofmt.h(trunk.2) $
 lofmt.h
    A format for the LO pool class. We have to allow for copying
    and forwarding, but scan should never be called.
@@ -7,7 +7,7 @@ lofmt.h
 #ifndef lofmt_h
 #define lofmt_h
 
-#include "mps.h"
+#include "testlib.h"
 
 extern int alloclocomments;
 extern int allowlocopies;
diff --git a/mps/qa/test/testlib/myfmt.c b/mps/qa/test/testlib/myfmt.c
index d5bf52d9fde..44ac5df2581 100644
--- a/mps/qa/test/testlib/myfmt.c
+++ b/mps/qa/test/testlib/myfmt.c
@@ -1,10 +1,8 @@
-/* $HopeName$
+/* $HopeName: MMQA_harness!testlib:myfmt.c(trunk.2) $
 myfmt.c
    a format for scannable objects
 */
 
-#include "mps.h"
-#include "testlib.h"
 #include "myfmt.h"
 #include <string.h>
 #include <stdio.h>
diff --git a/mps/qa/test/testlib/myfmt.h b/mps/qa/test/testlib/myfmt.h
index 762276adde4..9f8fddf69c8 100644
--- a/mps/qa/test/testlib/myfmt.h
+++ b/mps/qa/test/testlib/myfmt.h
@@ -1,4 +1,4 @@
-/* $HopeName$
+/* $HopeName: MMQA_harness!testlib:myfmt.h(trunk.2) $
 myfmt.h
    a format for scannable objects
 */
@@ -6,7 +6,6 @@ myfmt.h
 #ifndef myfmt_h
 #define myfmt_h
 
-#include "mps.h"
 #include "testlib.h"
 
 /* some options on the format are controlled by global
diff --git a/mps/qa/test/testlib/newfmt.c b/mps/qa/test/testlib/newfmt.c
index b2690be0168..30bdd779f1f 100644
--- a/mps/qa/test/testlib/newfmt.c
+++ b/mps/qa/test/testlib/newfmt.c
@@ -1,11 +1,9 @@
-/* $HopeName$
+/* $HopeName: MMQA_harness!testlib:newfmt.c(trunk.3) $
 newfmt.c
    My attempt to write a format using unions &c to avoid
    nasty casting all over the place
 */
 
-#include "mps.h"
-#include "testlib.h"
 #include "newfmt.h"
 #include <string.h>
 
diff --git a/mps/qa/test/testlib/newfmt.h b/mps/qa/test/testlib/newfmt.h
index 2bcf2b2157b..c79b84d5dfc 100644
--- a/mps/qa/test/testlib/newfmt.h
+++ b/mps/qa/test/testlib/newfmt.h
@@ -1,4 +1,4 @@
-/* $HopeName$
+/* $HopeName: MMQA_harness!testlib:newfmt.h(trunk.2) $
 newfmt.h
    A nice format with graph checking and statistics
 */
@@ -6,7 +6,7 @@ newfmt.h
 #ifndef newfmt_h
 #define newfmt_h
 
-#include "mps.h"
+#include "testlib.h"
 
 extern int formatcomments;
 extern int checkcomments;