diff --git a/basis/compiler/tests/curry.factor b/basis/compiler/tests/curry.factor
index 61d20fd8ab..ecc2d87b73 100755
--- a/basis/compiler/tests/curry.factor
+++ b/basis/compiler/tests/curry.factor
@@ -1,5 +1,5 @@
 USING: tools.test quotations math kernel sequences
-assocs namespaces compiler.units ;
+assocs namespaces make compiler.units ;
 IN: compiler.tests
 
 [ 3 ] [ 5 [ [ 2 - ] curry call ] compile-call ] unit-test
diff --git a/basis/compiler/tests/templates-early.factor b/basis/compiler/tests/templates-early.factor
index 6b2eed0789..d3bc4a8a08 100755
--- a/basis/compiler/tests/templates-early.factor
+++ b/basis/compiler/tests/templates-early.factor
@@ -3,7 +3,7 @@ IN: compiler.tests
 USING: compiler compiler.generator compiler.generator.registers
 compiler.generator.registers.private tools.test namespaces
 sequences words kernel math effects definitions compiler.units
-accessors cpu.architecture ;
+accessors cpu.architecture make ;
 
 : <int-vreg> ( n -- vreg ) int-regs <vreg> ;
 
diff --git a/basis/concurrency/messaging/messaging-tests.factor b/basis/concurrency/messaging/messaging-tests.factor
index 0f9f97c4cc..dd94ad15b3 100755
--- a/basis/concurrency/messaging/messaging-tests.factor
+++ b/basis/concurrency/messaging/messaging-tests.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2005 Chris Double. All Rights Reserved.
 ! See http://factorcode.org/license.txt for BSD license.
-!
-USING: kernel threads vectors arrays sequences
-namespaces tools.test continuations deques strings math words
-match quotations concurrency.messaging concurrency.mailboxes
+USING: kernel threads vectors arrays sequences namespaces make
+tools.test continuations deques strings math words match
+quotations concurrency.messaging concurrency.mailboxes
 concurrency.count-downs accessors ;
 IN: concurrency.messaging.tests
 
diff --git a/basis/cpu/ppc/assembler/assembler-tests.factor b/basis/cpu/ppc/assembler/assembler-tests.factor
index 9fdaaf712f..f35a5cfca8 100644
--- a/basis/cpu/ppc/assembler/assembler-tests.factor
+++ b/basis/cpu/ppc/assembler/assembler-tests.factor
@@ -1,6 +1,6 @@
 IN: cpu.ppc.assembler.tests
 USING: cpu.ppc.assembler tools.test arrays kernel namespaces
-vocabs sequences ;
+make vocabs sequences ;
 
 : test-assembler ( expected quot -- )
     [ 1array ] [ [ { } make ] curry ] bi* unit-test ;
diff --git a/basis/cpu/x86/assembler/assembler-tests.factor b/basis/cpu/x86/assembler/assembler-tests.factor
index 4c0f04fcc2..941bbe5b73 100644
--- a/basis/cpu/x86/assembler/assembler-tests.factor
+++ b/basis/cpu/x86/assembler/assembler-tests.factor
@@ -1,4 +1,4 @@
-USING: cpu.x86.assembler kernel tools.test namespaces ;
+USING: cpu.x86.assembler kernel tools.test namespaces make ;
 IN: cpu.x86.assembler.tests
 
 [ { HEX: 49 HEX: 89 HEX: 04 HEX: 24 } ] [ [ R12 [] RAX MOV ] { } make ] unit-test
diff --git a/basis/fry/fry-tests.factor b/basis/fry/fry-tests.factor
index 5c5908416d..d4a3b8b734 100755
--- a/basis/fry/fry-tests.factor
+++ b/basis/fry/fry-tests.factor
@@ -33,7 +33,7 @@ sequences ;
 ] unit-test
 
 [ { { 1 "a" 2 } { 1 "b" 2 } { 1 "c" 2 } } ] [
-    1 2 '[ [ _ ] dip , 3array ]
+    1 2 '[ [ _ ] dip _ 3array ]
     { "a" "b" "c" } swap map
 ] unit-test
 
diff --git a/basis/furnace/sessions/sessions-tests.factor b/basis/furnace/sessions/sessions-tests.factor
index 98d1bbdfc9..ff089a92b2 100755
--- a/basis/furnace/sessions/sessions-tests.factor
+++ b/basis/furnace/sessions/sessions-tests.factor
@@ -1,10 +1,9 @@
 IN: furnace.sessions.tests
-USING: tools.test http furnace.sessions
-furnace.actions http.server http.server.responses
-math namespaces kernel accessors io.sockets io.servers.connection
-prettyprint io.streams.string io.files splitting destructors
-sequences db db.tuples db.sqlite continuations urls math.parser
-furnace ;
+USING: tools.test http furnace.sessions furnace.actions
+http.server http.server.responses math namespaces make kernel
+accessors io.sockets io.servers.connection prettyprint
+io.streams.string io.files splitting destructors sequences db
+db.tuples db.sqlite continuations urls math.parser furnace ;
 
 : with-session
     [
diff --git a/basis/io/unix/unix-tests.factor b/basis/io/unix/unix-tests.factor
index 3147d7144b..7e1dc48e5f 100755
--- a/basis/io/unix/unix-tests.factor
+++ b/basis/io/unix/unix-tests.factor
@@ -1,7 +1,7 @@
 USING: io.files io.sockets io kernel threads
 namespaces tools.test continuations strings byte-arrays
 sequences prettyprint system io.encodings.binary io.encodings.ascii
-io.streams.duplex destructors ;
+io.streams.duplex destructors make ;
 IN: io.unix.tests
 
 ! Unix domain stream sockets
diff --git a/basis/peg/peg-tests.factor b/basis/peg/peg-tests.factor
index 11001ca411..2d7e2a81ac 100644
--- a/basis/peg/peg-tests.factor
+++ b/basis/peg/peg-tests.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 !
-USING: kernel tools.test strings namespaces arrays sequences 
+USING: kernel tools.test strings namespaces make arrays sequences 
        peg peg.private accessors words math accessors ;
 IN: peg.tests
 
diff --git a/basis/prettyprint/prettyprint-tests.factor b/basis/prettyprint/prettyprint-tests.factor
index 9bffb34ed1..6a4ac71eb8 100755
--- a/basis/prettyprint/prettyprint-tests.factor
+++ b/basis/prettyprint/prettyprint-tests.factor
@@ -3,7 +3,7 @@ kernel math namespaces parser prettyprint prettyprint.config
 prettyprint.sections sequences tools.test vectors words
 effects splitting generic.standard prettyprint.private
 continuations generic compiler.units tools.walker eval
-accessors ;
+accessors make ;
 IN: prettyprint.tests
 
 [ "4" ] [ 4 unparse ] unit-test
@@ -181,7 +181,7 @@ DEFER: parse-error-file
 
 : another-soft-break-test
     {
-        "USING: namespaces sequences ;"
+        "USING: make sequences ;"
         "IN: prettyprint.tests"
         ": another-soft-break-layout ( node -- quot )"
         "    parse-error-file"
diff --git a/basis/random/mersenne-twister/mersenne-twister-docs.factor.bak b/basis/random/mersenne-twister/mersenne-twister-docs.factor.bak
deleted file mode 100644
index 981b206b29..0000000000
--- a/basis/random/mersenne-twister/mersenne-twister-docs.factor.bak
+++ /dev/null
@@ -1,31 +0,0 @@
-USING: help.markup help.syntax math ;
-IN: random.mersenne-twister
-
-ARTICLE: "random-numbers" "Generating random integers"
-"The " { $vocab-link "random" } " vocabulary implements the ``Mersenne Twister'' pseudo-random number generator algorithm."
-! { $subsection init-random }
-{ $subsection (random) }
-{ $subsection random } ;
-
-ABOUT: "random-numbers"
-
-! HELP: init-random
-! { $values { "seed" integer } }
-! { $description "Initializes the random number generator with the given seed. This word is called on startup to initialize the random number generator with the current time." } ;
-
-HELP: (random)
-{ $values { "rand" "an integer between 0 and 2^32-1" } }
-{ $description "Generates a random 32-bit unsigned integer." } ;
-
-HELP: random
-{ $values { "seq" "a sequence" } { "elt" "a random element" } }
-{ $description "Outputs a random element of the sequence. If the sequence is empty, always outputs " { $link f } "." }
-{ $notes "Since integers are sequences, passing an integer " { $snippet "n" } " yields a random integer in the interval " { $snippet "[0,n)" } "." } ;
-
-HELP: big-random
-{ $values { "n" "an integer" } { "r" "a random integer" } }
-{ $description "Outputs an integer with n bytes worth of bits." } ;
-
-HELP: random-256
-{ $values { "r" "a random integer" } }
-{ $description "Outputs an random integer 256 bits in length." } ;
diff --git a/basis/random/mersenne-twister/mersenne-twister-tests.factor b/basis/random/mersenne-twister/mersenne-twister-tests.factor
index d25ceacdb1..3f0ebf692a 100755
--- a/basis/random/mersenne-twister/mersenne-twister-tests.factor
+++ b/basis/random/mersenne-twister/mersenne-twister-tests.factor
@@ -1,5 +1,5 @@
-USING: kernel math random namespaces random.mersenne-twister
-sequences tools.test math.order ;
+USING: kernel math random namespaces make
+random.mersenne-twister sequences tools.test math.order ;
 IN: random.mersenne-twister.tests
 
 : check-random ( max -- ? )
diff --git a/basis/sequences/deep/deep-tests.factor b/basis/sequences/deep/deep-tests.factor
index 395086e202..a88634aa8a 100755
--- a/basis/sequences/deep/deep-tests.factor
+++ b/basis/sequences/deep/deep-tests.factor
@@ -1,5 +1,5 @@
 USING: sequences.deep kernel tools.test strings math arrays
-namespaces sequences ;
+namespaces make sequences ;
 IN: sequences.deep.tests
 
 [ [ "hello" 3 4 swap ] ] [ [ { "hello" V{ 3 4 } } swap ] flatten ] unit-test
diff --git a/basis/ui/traverse/traverse-tests.factor b/basis/ui/traverse/traverse-tests.factor
index 8486aaff21..e18637a652 100755
--- a/basis/ui/traverse/traverse-tests.factor
+++ b/basis/ui/traverse/traverse-tests.factor
@@ -1,6 +1,6 @@
-USING: accessors ui.gadgets ui.gadgets.labels namespaces sequences kernel
-math arrays tools.test io ui.gadgets.panes ui.traverse
-definitions compiler.units ;
+USING: accessors ui.gadgets ui.gadgets.labels namespaces make
+sequences kernel math arrays tools.test io ui.gadgets.panes
+ui.traverse definitions compiler.units ;
 IN: ui.traverse.tests
 
 M: array children>> ;
diff --git a/basis/xml/tests/test.factor b/basis/xml/tests/test.factor
index f2bd5ce1e3..623663ebe1 100644
--- a/basis/xml/tests/test.factor
+++ b/basis/xml/tests/test.factor
@@ -1,9 +1,10 @@
 ! Copyright (C) 2005, 2006 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 IN: xml.tests
-USING: kernel xml tools.test io namespaces sequences xml.errors xml.entities
-    parser strings xml.data io.files xml.writer xml.utilities state-parser 
-    continuations assocs sequences.deep accessors ;
+USING: kernel xml tools.test io namespaces make sequences
+xml.errors xml.entities parser strings xml.data io.files
+xml.writer xml.utilities state-parser continuations assocs
+sequences.deep accessors ;
 
 ! This is insufficient
 \ read-xml must-infer
diff --git a/core/assocs/assocs-tests.factor b/core/assocs/assocs-tests.factor
index 4a44dbd641..3deb08ac62 100755
--- a/core/assocs/assocs-tests.factor
+++ b/core/assocs/assocs-tests.factor
@@ -1,5 +1,5 @@
 IN: assocs.tests
-USING: kernel math namespaces tools.test vectors sequences
+USING: kernel math namespaces make tools.test vectors sequences
 sequences.private hashtables io prettyprint assocs
 continuations float-arrays ;
 
diff --git a/core/generic/standard/standard-tests.factor b/core/generic/standard/standard-tests.factor
index 52d73a9a4c..f6635276b3 100644
--- a/core/generic/standard/standard-tests.factor
+++ b/core/generic/standard/standard-tests.factor
@@ -1,7 +1,7 @@
 IN: generic.standard.tests
 USING: tools.test math math.functions math.constants
 generic.standard strings sequences arrays kernel accessors
-words float-arrays byte-arrays bit-arrays parser namespaces
+words float-arrays byte-arrays bit-arrays parser namespaces make
 quotations stack-checker vectors growable hashtables sbufs
 prettyprint byte-vectors bit-vectors float-vectors definitions
 generic sets graphs assocs ;
diff --git a/core/hashtables/hashtables-tests.factor b/core/hashtables/hashtables-tests.factor
index abf3747244..a59c649598 100755
--- a/core/hashtables/hashtables-tests.factor
+++ b/core/hashtables/hashtables-tests.factor
@@ -1,5 +1,5 @@
 IN: hashtables.tests
-USING: kernel math namespaces tools.test vectors sequences
+USING: kernel math namespaces make tools.test vectors sequences
 sequences.private hashtables io prettyprint assocs
 continuations ;
 
diff --git a/core/io/io-tests.factor b/core/io/io-tests.factor
index af40cf8737..c38a7c9ebc 100755
--- a/core/io/io-tests.factor
+++ b/core/io/io-tests.factor
@@ -1,5 +1,5 @@
 USING: arrays io io.files kernel math parser strings system
-tools.test words namespaces io.encodings.8-bit
+tools.test words namespaces make io.encodings.8-bit
 io.encodings.binary sequences ;
 IN: io.tests
 
diff --git a/core/io/streams/string/string-tests.factor b/core/io/streams/string/string-tests.factor
index 3512ac871d..a6502046c8 100644
--- a/core/io/streams/string/string-tests.factor
+++ b/core/io/streams/string/string-tests.factor
@@ -1,4 +1,5 @@
-USING: io.streams.string io kernel arrays namespaces tools.test ;
+USING: io.streams.string io kernel arrays namespaces make
+tools.test ;
 IN: io.streams.string.tests
 
 [ "line 1" CHAR: l ]
diff --git a/core/math/math-tests.factor b/core/math/math-tests.factor
index d72bb67970..c2077eb790 100644
--- a/core/math/math-tests.factor
+++ b/core/math/math-tests.factor
@@ -1,4 +1,4 @@
-USING: kernel math namespaces tools.test ;
+USING: kernel math namespaces make tools.test ;
 IN: math.tests
 
 [ ] [ 5 [ ] times ] unit-test
diff --git a/core/strings/strings-tests.factor b/core/strings/strings-tests.factor
index d10f1603f1..078785178b 100755
--- a/core/strings/strings-tests.factor
+++ b/core/strings/strings-tests.factor
@@ -1,6 +1,6 @@
-USING: continuations kernel math math.order namespaces strings
-strings.private sbufs tools.test sequences vectors arrays memory
-prettyprint io.streams.null ;
+USING: continuations kernel math math.order namespaces make
+strings strings.private sbufs tools.test sequences vectors
+arrays memory prettyprint io.streams.null ;
 IN: strings.tests
 
 [ CHAR: b ] [ 1 >bignum "abc" nth ] unit-test
diff --git a/extra/bank/bank-tests.factor b/extra/bank/bank-tests.factor
index 2aa31f1e85..5014d53019 100644
--- a/extra/bank/bank-tests.factor
+++ b/extra/bank/bank-tests.factor
@@ -1,4 +1,5 @@
-USING: accessors arrays bank calendar kernel math math.functions namespaces tools.test tools.walker ;
+USING: accessors arrays bank calendar kernel math math.functions
+namespaces make tools.test tools.walker ;
 IN: bank.tests
 
 SYMBOL: my-account
diff --git a/extra/pack/pack-tests.factor b/extra/pack/pack-tests.factor
index d58ccbd0f2..b1a354cd4e 100755
--- a/extra/pack/pack-tests.factor
+++ b/extra/pack/pack-tests.factor
@@ -1,4 +1,5 @@
-USING: io io.streams.string kernel namespaces pack strings tools.test ;
+USING: io io.streams.string kernel namespaces make
+pack strings tools.test ;
 
 [ B{ 1 0 2 0 0 3 0 0 0 4 0 0 0 0 0 0 0 5 } ] [
     { 1 2 3 4 5 }