diff --git a/library/assoc.factor b/library/assoc.factor
index d0a4383b1e..b1e9172537 100644
--- a/library/assoc.factor
+++ b/library/assoc.factor
@@ -26,10 +26,7 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: lists
-USE: logic
-USE: combinators
 USE: kernel
-USE: stack
 
 ! An association list is a list of conses where the car of each
 ! cons is a key, and the cdr is a value. See the Factor
diff --git a/library/bootstrap/boot-stage2.factor b/library/bootstrap/boot-stage2.factor
index f6204ce759..a3cf348158 100644
--- a/library/bootstrap/boot-stage2.factor
+++ b/library/bootstrap/boot-stage2.factor
@@ -26,11 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: init
-USE: combinators
 USE: kernel
 USE: lists
 USE: parser
-USE: stack
 USE: stdio
 
 "Cold boot in progress..." print
diff --git a/library/bootstrap/boot.factor b/library/bootstrap/boot.factor
index dae2a79723..126ffabebd 100644
--- a/library/bootstrap/boot.factor
+++ b/library/bootstrap/boot.factor
@@ -30,19 +30,18 @@ USE: image
 USE: parser
 USE: namespaces
 USE: stdio
-USE: combinators
 USE: kernel
 USE: vectors
 
 primitives,
 [
     "/version.factor"
-    "/library/kernel.factor"
     "/library/stack.factor"
+    "/library/kernel.factor"
     "/library/types.factor"
+    "/library/combinators.factor"
     "/library/math/math.factor"
     "/library/cons.factor"
-    "/library/combinators.factor"
     "/library/logic.factor"
     "/library/vector-combinators.factor"
     "/library/lists.factor"
diff --git a/library/bootstrap/cross-compiler.factor b/library/bootstrap/cross-compiler.factor
index 9afb380f62..36172ae060 100644
--- a/library/bootstrap/cross-compiler.factor
+++ b/library/bootstrap/cross-compiler.factor
@@ -25,7 +25,6 @@
 ! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-USE: combinators
 USE: errors
 USE: kernel
 USE: lists
@@ -33,12 +32,10 @@ USE: math
 USE: math-internals
 USE: namespaces
 USE: parser
-USE: stack
 USE: stdio
 USE: streams
 USE: strings
 USE: vectors
-USE: vectors
 USE: words
 
 IN: alien
@@ -76,6 +73,19 @@ DEFER: type
 DEFER: size
 DEFER: address
 DEFER: heap-stats
+DEFER: drop
+DEFER: dup
+DEFER: over
+DEFER: pick
+DEFER: swap
+DEFER: >r
+DEFER: r>
+DEFER: ifte
+DEFER: call
+DEFER: datastack
+DEFER: callstack
+DEFER: set-datastack
+DEFER: set-callstack
 
 IN: strings
 DEFER: str=
@@ -394,7 +404,7 @@ IN: image
         heap-stats
         throw
     ] [
-        swap succ tuck f define,
+        USE: stack swap succ tuck f define,
     ] each drop ;
 
 : make-image ( name -- )
diff --git a/library/bootstrap/image.factor b/library/bootstrap/image.factor
index ca1b2d2d70..d379ab73b8 100644
--- a/library/bootstrap/image.factor
+++ b/library/bootstrap/image.factor
@@ -39,17 +39,14 @@
 ! run platform/native/boot-stage2.factor.
 
 IN: image
-USE: combinators
 USE: errors
 USE: hashtables
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
 USE: prettyprint
 USE: random
-USE: stack
 USE: stdio
 USE: streams
 USE: strings
@@ -58,6 +55,10 @@ USE: vectors
 USE: unparser
 USE: words
 
+USE: stack
+USE: combinators
+USE: logic
+
 ! The image being constructed; a vector of word-size integers
 SYMBOL: image
 
@@ -191,7 +192,13 @@ SYMBOL: boot-quot
     dup pooled-object dup [
         nip
     ] [
-        drop "Not in image: " swap word-name cat2 throw
+        drop
+        [
+            "Not in image: " ,
+            dup word-vocabulary ,
+            " " ,
+            word-name ,
+        ] make-string throw
     ] ifte ;
 
 : fixup-words ( -- )
diff --git a/library/bootstrap/init-stage2.factor b/library/bootstrap/init-stage2.factor
index 6dc8b66282..e2ac484604 100644
--- a/library/bootstrap/init-stage2.factor
+++ b/library/bootstrap/init-stage2.factor
@@ -27,7 +27,6 @@
 
 IN: init
 USE: ansi
-USE: combinators
 USE: compiler
 USE: errors
 USE: inference
@@ -38,7 +37,6 @@ USE: math
 USE: namespaces
 USE: parser
 USE: random
-USE: stack
 USE: streams
 USE: stdio
 USE: presentation
diff --git a/library/bootstrap/init.factor b/library/bootstrap/init.factor
index a88b4a6f41..5e394005dd 100644
--- a/library/bootstrap/init.factor
+++ b/library/bootstrap/init.factor
@@ -26,7 +26,6 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: init
-USE: combinators
 USE: compiler
 USE: errors
 USE: kernel
diff --git a/library/cli.factor b/library/cli.factor
index fae4d0508e..8e74bd5682 100644
--- a/library/cli.factor
+++ b/library/cli.factor
@@ -26,9 +26,7 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: init
-USE: combinators
 USE: compiler
-USE: continuations
 USE: errors
 USE: files
 USE: listener
@@ -38,7 +36,6 @@ USE: namespaces
 USE: parser
 USE: prettyprint
 USE: random
-USE: stack
 USE: stdio
 USE: streams
 USE: strings
diff --git a/library/combinators.factor b/library/combinators.factor
index 9ca96cd28b..290e00d096 100644
--- a/library/combinators.factor
+++ b/library/combinators.factor
@@ -25,10 +25,8 @@
 ! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-IN: combinators
-USE: kernel
+IN: kernel
 USE: lists
-USE: stack
 
 : slip ( quot x -- x )
     >r call r> ; inline
diff --git a/library/compiler/alien-macros.factor b/library/compiler/alien-macros.factor
index 1f259bf0c0..717d1d4576 100644
--- a/library/compiler/alien-macros.factor
+++ b/library/compiler/alien-macros.factor
@@ -26,13 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: alien
-USE: combinators
 USE: compiler
 USE: kernel
 USE: lists
 USE: math
 USE: namespaces
-USE: stack
 
 : UNBOX ( name -- )
     #! Move top of datastack to C stack.
diff --git a/library/compiler/alien-types.factor b/library/compiler/alien-types.factor
index 7c6fd62199..8de5359d6b 100644
--- a/library/compiler/alien-types.factor
+++ b/library/compiler/alien-types.factor
@@ -26,17 +26,14 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: alien
-USE: combinators
 USE: compiler
 USE: errors
 USE: hashtables
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
 USE: parser
-USE: stack
 USE: strings
 USE: words
 
diff --git a/library/compiler/alien.factor b/library/compiler/alien.factor
index f86079bef6..f6fd713986 100644
--- a/library/compiler/alien.factor
+++ b/library/compiler/alien.factor
@@ -26,14 +26,13 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: alien
-USE: combinators
 USE: compiler
 USE: errors
+USE: kernel
 USE: lists
 USE: math
 USE: namespaces
 USE: parser
-USE: stack
 USE: words
 
 : BEGIN-ENUM:
diff --git a/library/compiler/assembler.factor b/library/compiler/assembler.factor
index cecd3f35ac..c4384fd11e 100644
--- a/library/compiler/assembler.factor
+++ b/library/compiler/assembler.factor
@@ -26,10 +26,8 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: compiler
-USE: combinators
 USE: math
 USE: kernel
-USE: stack
 
 : cell 4 ;
 : literal-table 1024 cell * ;
diff --git a/library/compiler/assembly-x86.factor b/library/compiler/assembly-x86.factor
index ea592a45de..1e4c2533fa 100644
--- a/library/compiler/assembly-x86.factor
+++ b/library/compiler/assembly-x86.factor
@@ -29,8 +29,6 @@ IN: compiler
 USE: kernel
 USE: compiler
 USE: math
-USE: stack
-USE: combinators
 
 : EAX 0 ;
 : ECX 1 ;
diff --git a/library/compiler/compiler.factor b/library/compiler/compiler.factor
index 2a04e63360..8536eaf3cf 100644
--- a/library/compiler/compiler.factor
+++ b/library/compiler/compiler.factor
@@ -26,18 +26,15 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: compiler
-USE: combinators
 USE: inference
 USE: errors
 USE: hashtables
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
 USE: parser
 USE: prettyprint
-USE: stack
 USE: stdio
 USE: strings
 USE: unparser
diff --git a/library/compiler/generator-x86.factor b/library/compiler/generator-x86.factor
index 4f72e3f158..2a840b6e48 100644
--- a/library/compiler/generator-x86.factor
+++ b/library/compiler/generator-x86.factor
@@ -27,15 +27,12 @@
 
 IN: compiler
 USE: alien
-USE: combinators
 USE: inference
 USE: errors
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: words
 USE: vectors
diff --git a/library/compiler/generator.factor b/library/compiler/generator.factor
index c53c78c21e..750684d78e 100644
--- a/library/compiler/generator.factor
+++ b/library/compiler/generator.factor
@@ -26,13 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: compiler
-USE: combinators
 USE: inference
 USE: errors
+USE: kernel
 USE: lists
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: words
 
diff --git a/library/compiler/linearizer.factor b/library/compiler/linearizer.factor
index 7590fc97cc..0ba78a3c49 100644
--- a/library/compiler/linearizer.factor
+++ b/library/compiler/linearizer.factor
@@ -26,15 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: compiler
-USE: lists
-USE: words
-USE: stack
-USE: namespaces
 USE: inference
-USE: combinators
-USE: math
-USE: logic
 USE: kernel
+USE: lists
+USE: math
+USE: namespaces
+USE: words
 
 ! The linear IR is close to assembly language. It also resembles
 ! Forth code in some sense. It exists so that pattern matching
diff --git a/library/compiler/optimizer.factor b/library/compiler/optimizer.factor
index 84751bc4cc..084b157098 100644
--- a/library/compiler/optimizer.factor
+++ b/library/compiler/optimizer.factor
@@ -27,14 +27,11 @@
 
 IN: compiler
 USE: lists
-USE: stack
-USE: combinators
 USE: namespaces
 USE: kernel
 USE: inference
 USE: words
 USE: prettyprint
-USE: logic
 
 ! The optimizer transforms dataflow IR to dataflow IR. Currently
 ! it removes literals that are eventually dropped, and never
diff --git a/library/compiler/xt.factor b/library/compiler/xt.factor
index 492cacf06c..32e8b2a520 100644
--- a/library/compiler/xt.factor
+++ b/library/compiler/xt.factor
@@ -26,18 +26,15 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: compiler
-USE: combinators
 USE: inference
 USE: errors
 USE: hashtables
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
 USE: parser
 USE: prettyprint
-USE: stack
 USE: stdio
 USE: strings
 USE: unparser
diff --git a/library/cons.factor b/library/cons.factor
index 771915475f..37d9aa9a6c 100644
--- a/library/cons.factor
+++ b/library/cons.factor
@@ -25,7 +25,8 @@
 ! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-IN: lists USE: kernel USE: stack
+IN: lists
+USE: kernel
 
 : swons ( cdr car -- [ car | cdr ] )
     #! Push a new cons cell. If the cdr is f or a proper list,
diff --git a/library/continuations.factor b/library/continuations.factor
index b4fcd482a5..2174440544 100644
--- a/library/continuations.factor
+++ b/library/continuations.factor
@@ -25,13 +25,11 @@
 ! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-IN: continuations
-USE: combinators
+IN: kernel
 USE: errors
 USE: kernel
 USE: lists
 USE: namespaces
-USE: stack
 USE: vectors
 
 : reify ( quot -- )
diff --git a/library/errors.factor b/library/errors.factor
index 36ab85ba6e..72f40d86e0 100644
--- a/library/errors.factor
+++ b/library/errors.factor
@@ -26,13 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: errors
-USE: combinators
-USE: continuations
 USE: kernel
 USE: lists
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: vectors
 
diff --git a/library/eval-catch.factor b/library/eval-catch.factor
index 216f3bc802..b77c72a1a6 100644
--- a/library/eval-catch.factor
+++ b/library/eval-catch.factor
@@ -26,9 +26,8 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: parser
+USE: kernel
 USE: errors
-USE: stack
-USE: combinators
 USE: stdio
 
 : eval-catch ( str -- )
diff --git a/library/format.factor b/library/format.factor
index 18f19d9e05..7475325079 100644
--- a/library/format.factor
+++ b/library/format.factor
@@ -26,12 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: format
-USE: combinators
 USE: kernel
 USE: math
 USE: namespaces
 USE: strings
-USE: stack
 
 : decimal-split ( string -- string string )
     #! Split a string before and after the decimal point.
diff --git a/library/generic.factor b/library/generic.factor
index c25c7b65ec..ff1ea3df79 100644
--- a/library/generic.factor
+++ b/library/generic.factor
@@ -27,14 +27,12 @@
 
 IN: generic
 
-USE: combinators
 USE: errors
 USE: hashtables
 USE: kernel
 USE: lists
 USE: namespaces
 USE: parser
-USE: stack
 USE: strings
 USE: words
 USE: vectors
diff --git a/library/gensym.factor b/library/gensym.factor
index a90816c2a3..ac186b18b9 100644
--- a/library/gensym.factor
+++ b/library/gensym.factor
@@ -26,9 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: words
+USE: kernel
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: unparser
 
diff --git a/library/hashtables.factor b/library/hashtables.factor
index 9cc83aa847..34a6690a75 100644
--- a/library/hashtables.factor
+++ b/library/hashtables.factor
@@ -26,11 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: hashtables
-USE: combinators
 USE: kernel
 USE: lists
 USE: math
-USE: stack
 USE: vectors
 
 ! Note that the length of a hashtable vector must not change
diff --git a/library/httpd/default-responders.factor b/library/httpd/default-responders.factor
index 73ae64fbd2..5ccf6217eb 100644
--- a/library/httpd/default-responders.factor
+++ b/library/httpd/default-responders.factor
@@ -27,8 +27,8 @@
 
 IN: httpd-responder
 USE: httpd
+USE: kernel
 USE: namespaces
-USE: stack
 USE: strings
 
 USE: test-responder
diff --git a/library/httpd/file-responder.factor b/library/httpd/file-responder.factor
index b16ae51086..092c84cf09 100644
--- a/library/httpd/file-responder.factor
+++ b/library/httpd/file-responder.factor
@@ -26,7 +26,6 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: file-responder
-USE: combinators
 USE: errors
 USE: files
 USE: html
@@ -37,7 +36,6 @@ USE: lists
 USE: logging
 USE: namespaces
 USE: parser
-USE: stack
 USE: stdio
 USE: streams
 USE: strings
diff --git a/library/httpd/html-tags.factor b/library/httpd/html-tags.factor
index 1df7cfe991..31f80e4378 100644
--- a/library/httpd/html-tags.factor
+++ b/library/httpd/html-tags.factor
@@ -27,12 +27,10 @@ IN: html
 USE: strings
 USE: lists
 USE: format
-USE: stack
-USE: combinators
+USE: kernel
 USE: stdio
 USE: namespaces
 USE: words
-USE: logic
 
 ! These words are used to provide a means of writing
 ! formatted HTML to standard output with a familiar 'html' look
diff --git a/library/httpd/html.factor b/library/httpd/html.factor
index c3b5381ffb..d798234271 100644
--- a/library/httpd/html.factor
+++ b/library/httpd/html.factor
@@ -26,13 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: html
-USE: combinators
 USE: format
 USE: lists
-USE: logic
 USE: kernel
 USE: namespaces
-USE: stack
 USE: stdio
 USE: streams
 USE: strings
diff --git a/library/httpd/http-common.factor b/library/httpd/http-common.factor
index 3c68a1b983..ccce12bce1 100644
--- a/library/httpd/http-common.factor
+++ b/library/httpd/http-common.factor
@@ -27,14 +27,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: httpd
-USE: combinators
 USE: format
 USE: kernel
 USE: lists
 USE: logging
 USE: namespaces
 USE: parser
-USE: stack
 USE: stdio
 USE: streams
 USE: strings
diff --git a/library/httpd/httpd.factor b/library/httpd/httpd.factor
index 162bc4da50..9623ad55c8 100644
--- a/library/httpd/httpd.factor
+++ b/library/httpd/httpd.factor
@@ -26,15 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: httpd
-USE: combinators
 USE: errors
 USE: httpd-responder
 USE: kernel
 USE: lists
 USE: logging
-USE: logic
 USE: namespaces
-USE: stack
 USE: stdio
 USE: streams
 USE: strings
diff --git a/library/httpd/inspect-responder.factor b/library/httpd/inspect-responder.factor
index f99a6e47ba..3b626cbff5 100644
--- a/library/httpd/inspect-responder.factor
+++ b/library/httpd/inspect-responder.factor
@@ -29,7 +29,7 @@ IN: inspect-responder
 USE: html
 USE: inspector
 USE: namespaces
-USE: stack
+USE: kernel
 
 USE: httpd
 USE: httpd-responder
diff --git a/library/httpd/quit-responder.factor b/library/httpd/quit-responder.factor
index 36d6ae03f6..5d99f77b39 100644
--- a/library/httpd/quit-responder.factor
+++ b/library/httpd/quit-responder.factor
@@ -26,11 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: quit-responder
-USE: combinators
 USE: httpd
 USE: httpd-responder
 USE: namespaces
-USE: stack
+USE: kernel
 USE: stdio
 USE: streams
 
diff --git a/library/httpd/resource-responder.factor b/library/httpd/resource-responder.factor
index eec95622d8..7c27b5a892 100644
--- a/library/httpd/resource-responder.factor
+++ b/library/httpd/resource-responder.factor
@@ -26,16 +26,13 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: resource-responder
-USE: combinators
 USE: files
 USE: httpd
 USE: httpd-responder
 USE: kernel
 USE: lists
-USE: logic
 USE: namespaces
 USE: parser
-USE: stack
 USE: stdio
 USE: streams
 USE: strings
diff --git a/library/httpd/responder.factor b/library/httpd/responder.factor
index 52b74cdd76..b374dbabba 100644
--- a/library/httpd/responder.factor
+++ b/library/httpd/responder.factor
@@ -27,7 +27,6 @@
 
 IN: httpd-responder
 
-USE: combinators
 USE: hashtables
 USE: httpd
 USE: kernel
@@ -35,7 +34,6 @@ USE: lists
 USE: logging
 USE: namespaces
 USE: stdio
-USE: stack
 USE: streams
 USE: strings
 
diff --git a/library/httpd/test-responder.factor b/library/httpd/test-responder.factor
index 323723c4d9..5b8a50bcb2 100644
--- a/library/httpd/test-responder.factor
+++ b/library/httpd/test-responder.factor
@@ -29,7 +29,7 @@ IN: test-responder
 USE: html
 USE: httpd
 USE: httpd-responder
-USE: stack
+USE: kernel
 USE: test
 
 : test-responder ( argument -- )
diff --git a/library/httpd/url-encoding.factor b/library/httpd/url-encoding.factor
index 7819d44294..96a2bf9558 100644
--- a/library/httpd/url-encoding.factor
+++ b/library/httpd/url-encoding.factor
@@ -26,15 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: url-encoding
-USE: combinators
 USE: errors
 USE: kernel
 USE: lists
-USE: logic
 USE: format
 USE: math
 USE: parser
-USE: stack
 USE: strings
 USE: unparser
 
diff --git a/library/in-thread.factor b/library/in-thread.factor
index 71dfac12cc..cfda3f0b64 100644
--- a/library/in-thread.factor
+++ b/library/in-thread.factor
@@ -26,13 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: threads
-USE: combinators
-USE: continuations
 USE: errors
 USE: io-internals
 USE: kernel
 USE: lists
-USE: stack
 
 : in-thread ( quot -- )
     #! Execute a quotation in a co-operative thread. The
diff --git a/library/inference/branches.factor b/library/inference/branches.factor
index 0e85bc6812..75554d98b7 100644
--- a/library/inference/branches.factor
+++ b/library/inference/branches.factor
@@ -26,16 +26,13 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: inference
-USE: combinators
 USE: errors
 USE: generic
 USE: interpreter
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: vectors
 USE: words
diff --git a/library/inference/dataflow.factor b/library/inference/dataflow.factor
index 873e89c3d6..97bcbb3b84 100644
--- a/library/inference/dataflow.factor
+++ b/library/inference/dataflow.factor
@@ -27,12 +27,11 @@
 
 IN: inference
 USE: interpreter
+USE: kernel
 USE: lists
 USE: math
 USE: namespaces
-USE: stack
 USE: words
-USE: combinators
 USE: vectors
 
 ! We build a dataflow graph for the compiler.
diff --git a/library/inference/inference.factor b/library/inference/inference.factor
index 642463c7e0..88dec25a60 100644
--- a/library/inference/inference.factor
+++ b/library/inference/inference.factor
@@ -26,15 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: inference
-USE: combinators
 USE: errors
 USE: interpreter
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: vectors
 USE: words
diff --git a/library/inference/stack.factor b/library/inference/stack.factor
index a986885eb8..75d5e9386c 100644
--- a/library/inference/stack.factor
+++ b/library/inference/stack.factor
@@ -27,10 +27,10 @@
 
 IN: inference
 USE: interpreter
-USE: stack
-USE: words
+USE: kernel
 USE: lists
 USE: namespaces
+USE: words
 
 \ >r [
     f #>r dataflow, [ 1 0 node-inputs ] extend
diff --git a/library/inference/words.factor b/library/inference/words.factor
index aed2681fd8..a935a538ae 100644
--- a/library/inference/words.factor
+++ b/library/inference/words.factor
@@ -26,15 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: inference
-USE: combinators
 USE: errors
 USE: interpreter
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: vectors
 USE: words
diff --git a/library/io/ansi.factor b/library/io/ansi.factor
index 160218a5da..d38db71a22 100644
--- a/library/io/ansi.factor
+++ b/library/io/ansi.factor
@@ -26,12 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: ansi
-USE: combinators
 USE: lists
 USE: kernel
 USE: format
 USE: namespaces
-USE: stack
 USE: stdio
 USE: streams
 USE: strings
diff --git a/library/io/files.factor b/library/io/files.factor
index 8ea4a54109..ae97179635 100644
--- a/library/io/files.factor
+++ b/library/io/files.factor
@@ -26,13 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: files
-USE: combinators
+USE: kernel
 USE: hashtables
 USE: lists
-USE: logic
 USE: namespaces
 USE: presentation
-USE: stack
 USE: stdio
 USE: strings
 
diff --git a/library/io/io-internals.factor b/library/io/io-internals.factor
index 47302832a9..f80d9b4d53 100644
--- a/library/io/io-internals.factor
+++ b/library/io/io-internals.factor
@@ -26,11 +26,8 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: io-internals
-USE: combinators
-USE: continuations
 USE: kernel
 USE: namespaces
-USE: stack
 USE: strings
 USE: threads
 
diff --git a/library/io/logging.factor b/library/io/logging.factor
index b8f57a1b46..07b97e50c3 100644
--- a/library/io/logging.factor
+++ b/library/io/logging.factor
@@ -27,10 +27,9 @@
 
 IN: logging
 
-USE: combinators
 USE: hashtables
+USE: kernel
 USE: namespaces
-USE: stack
 USE: stdio
 USE: streams
 USE: strings
diff --git a/library/io/network.factor b/library/io/network.factor
index bca390ed83..2158e2b34b 100644
--- a/library/io/network.factor
+++ b/library/io/network.factor
@@ -26,14 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: streams
-USE: combinators
-USE: continuations
 USE: io-internals
 USE: errors
 USE: hashtables
 USE: kernel
-USE: logic
-USE: stack
 USE: stdio
 USE: strings
 USE: namespaces
diff --git a/library/io/presentation.factor b/library/io/presentation.factor
index 72db2b6c22..dbe113c577 100644
--- a/library/io/presentation.factor
+++ b/library/io/presentation.factor
@@ -26,12 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: presentation
-USE: combinators
 USE: hashtables
 USE: kernel
 USE: lists
 USE: namespaces
-USE: stack
 USE: strings
 USE: unparser
 
diff --git a/library/io/stdio-binary.factor b/library/io/stdio-binary.factor
index 5d9212d0c6..32390881af 100644
--- a/library/io/stdio-binary.factor
+++ b/library/io/stdio-binary.factor
@@ -26,8 +26,8 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: stdio
+USE: kernel
 USE: math
-USE: stack
 USE: streams
 USE: strings
 
diff --git a/library/io/stdio.factor b/library/io/stdio.factor
index d5cc6e4269..79a5e57b76 100644
--- a/library/io/stdio.factor
+++ b/library/io/stdio.factor
@@ -26,12 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: stdio
-USE: combinators
 USE: errors
 USE: kernel
 USE: lists
 USE: namespaces
-USE: stack
 USE: streams
 USE: generic
 USE: strings
diff --git a/library/io/stream-impl.factor b/library/io/stream-impl.factor
index 9dbe3bb204..856e4d9527 100644
--- a/library/io/stream-impl.factor
+++ b/library/io/stream-impl.factor
@@ -29,14 +29,10 @@ IN: stdio
 DEFER: stdio
 
 IN: streams
-USE: combinators
-USE: continuations
 USE: io-internals
 USE: errors
 USE: hashtables
 USE: kernel
-USE: logic
-USE: stack
 USE: stdio
 USE: strings
 USE: namespaces
diff --git a/library/io/stream.factor b/library/io/stream.factor
index 3659a0c36a..6815d64ca5 100644
--- a/library/io/stream.factor
+++ b/library/io/stream.factor
@@ -26,11 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: streams
-USE: combinators
 USE: errors
 USE: kernel
 USE: namespaces
-USE: stack
 USE: strings
 USE: generic
 
diff --git a/library/io/vocabulary-style.factor b/library/io/vocabulary-style.factor
index 37bcb5bd7e..63a7c933e7 100644
--- a/library/io/vocabulary-style.factor
+++ b/library/io/vocabulary-style.factor
@@ -26,12 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: presentation
-USE: combinators
 USE: hashtables
 USE: lists
 USE: kernel
 USE: namespaces
-USE: stack
 USE: words
 
 : vocab-style ( vocab -- style )
@@ -51,14 +49,6 @@ USE: words
     [ "ansi-fg" | "1" ]
     [ "fg" | [ 204 0 0 ] ]
 ] "arithmetic" set-vocab-style
-[
-    [ "ansi-fg" | "3" ]
-    [ "fg" | [ 255 132 0 ] ]
-] "combinators" set-vocab-style
-[
-    [ "ansi-fg" | "5" ]
-    [ "fg" | [ 102 0 204 ] ]
-] "continuations" set-vocab-style
 [
     [ "ansi-fg" | "1" ]
     [ "fg" | [ 255 0 0 ] ]
@@ -71,10 +61,6 @@ USE: words
     [ "ansi-fg" | "2" ]
     [ "fg" | [ 0 102 153 ] ]
 ] "lists" set-vocab-style
-[
-    [ "ansi-fg" | "6" ]
-    [ "fg" | [ 0 153 102 ] ]
-] "logic" set-vocab-style
 [
     [ "ansi-fg" | "1" ]
     [ "fg" | [ 204 0 0 ] ]
diff --git a/library/kernel.factor b/library/kernel.factor
index 68dfe7509d..29c7812c98 100644
--- a/library/kernel.factor
+++ b/library/kernel.factor
@@ -30,12 +30,9 @@ DEFER: vector=
 DEFER: vector-hashcode
 
 IN: kernel
-
-USE: combinators
 USE: lists
 USE: math
 USE: math-internals
-USE: stack
 USE: strings
 USE: vectors
 USE: words
diff --git a/library/list-namespaces.factor b/library/list-namespaces.factor
index 70b5c8661f..b32c585ffa 100644
--- a/library/list-namespaces.factor
+++ b/library/list-namespaces.factor
@@ -26,10 +26,8 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: lists
-USE: combinators
 USE: kernel
 USE: namespaces
-USE: stack
 USE: math
 
 : cons@ ( x var -- )
diff --git a/library/lists.factor b/library/lists.factor
index 989efcf839..f01f6adf62 100644
--- a/library/lists.factor
+++ b/library/lists.factor
@@ -26,11 +26,8 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: lists
-USE: combinators
 USE: kernel
-USE: logic
 USE: math
-USE: stack
 USE: vectors
 
 : 2list ( a b -- [ a b ] )
diff --git a/library/logic.factor b/library/logic.factor
index db93b48b67..566f1f5888 100644
--- a/library/logic.factor
+++ b/library/logic.factor
@@ -25,10 +25,7 @@
 ! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-IN: logic
-USE: combinators
-USE: kernel
-USE: stack
+IN: kernel
 
 : ? ( cond t f -- t/f )
     #! Push t if cond is true, otherwise push f.
diff --git a/library/math/arc-trig-hyp.factor b/library/math/arc-trig-hyp.factor
index 009901e3be..0eff0791f2 100644
--- a/library/math/arc-trig-hyp.factor
+++ b/library/math/arc-trig-hyp.factor
@@ -26,10 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
+USE: kernel
 USE: math
 USE: math-internals
-USE: stack
 
 ! Inverse trigonometric functions:
 !    acos asec asin acosec atan acot
diff --git a/library/math/arithmetic.factor b/library/math/arithmetic.factor
index 0753afd43b..985b967f69 100644
--- a/library/math/arithmetic.factor
+++ b/library/math/arithmetic.factor
@@ -26,10 +26,7 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
 USE: kernel
-USE: logic
-USE: stack
 
 : integer? dup fixnum? swap bignum? or ;
 : rational? dup integer? swap ratio? or ;
diff --git a/library/math/generic.factor b/library/math/generic.factor
index 0f2dfa85a1..fcfece71a1 100644
--- a/library/math/generic.factor
+++ b/library/math/generic.factor
@@ -26,11 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
 USE: errors
 USE: generic
 USE: kernel
-USE: stack
 USE: vectors
 USE: words
 
diff --git a/library/math/math-combinators.factor b/library/math/math-combinators.factor
index 367e1dba33..c3e8835cbc 100644
--- a/library/math/math-combinators.factor
+++ b/library/math/math-combinators.factor
@@ -26,9 +26,7 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
 USE: kernel
-USE: stack
 
 : times ( n quot -- )
     #! Evaluate a quotation n times.
diff --git a/library/math/math.factor b/library/math/math.factor
index 55add939ff..4b5ad9c31b 100644
--- a/library/math/math.factor
+++ b/library/math/math.factor
@@ -26,12 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
 USE: kernel
-USE: logic
 USE: math
 USE: math-internals
-USE: stack
 
 : fac ( n -- n! )
     ! This is the naive implementation, for benchmarking purposes.
diff --git a/library/math/namespace-math.factor b/library/math/namespace-math.factor
index f856f78c7b..32d79f0fe4 100644
--- a/library/math/namespace-math.factor
+++ b/library/math/namespace-math.factor
@@ -26,10 +26,8 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
-USE: logic
+USE: kernel
 USE: namespaces
-USE: stack
 
 : +@ ( num var -- ) tuck get + put ;
 : -@ ( num var -- ) tuck get swap - put ;
diff --git a/library/math/pow.factor b/library/math/pow.factor
index 39815fd3e7..a2d4529c55 100644
--- a/library/math/pow.factor
+++ b/library/math/pow.factor
@@ -26,12 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
 USE: math
 USE: math-internals
 USE: kernel
-USE: logic
-USE: stack
 
 ! Power-related functions:
 !     exp log sqrt pow
diff --git a/library/math/trig-hyp.factor b/library/math/trig-hyp.factor
index 7e11b62793..b1c4d2a367 100644
--- a/library/math/trig-hyp.factor
+++ b/library/math/trig-hyp.factor
@@ -26,11 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: math
-USE: combinators
 USE: kernel
 USE: math
 USE: math-internals
-USE: stack
 
 ! Trigonometric functions:
 !    cos sec sin cosec tan cot
diff --git a/library/namespaces.factor b/library/namespaces.factor
index a2a228835f..deff87a645 100644
--- a/library/namespaces.factor
+++ b/library/namespaces.factor
@@ -26,12 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: namespaces
-USE: combinators
 USE: hashtables
 USE: kernel
 USE: lists
-USE: logic
-USE: stack
 USE: strings
 USE: vectors
 
diff --git a/library/primitives.factor b/library/primitives.factor
index fbb1c7a369..ebd94178a6 100644
--- a/library/primitives.factor
+++ b/library/primitives.factor
@@ -25,7 +25,6 @@
 ! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-USE: combinators
 USE: alien
 USE: compiler
 USE: errors
@@ -38,7 +37,6 @@ USE: math-internals
 USE: parser
 USE: profiler
 USE: random
-USE: stack
 USE: strings
 USE: unparser
 USE: vectors
diff --git a/library/random.factor b/library/random.factor
index 448f01d1ec..03e06c3ecc 100644
--- a/library/random.factor
+++ b/library/random.factor
@@ -26,11 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: random
-USE: combinators
 USE: kernel
 USE: lists
 USE: math
-USE: stack
 
 : power-of-2? ( n -- ? )
     dup dup neg bitand = ;
diff --git a/library/sbuf.factor b/library/sbuf.factor
index bbb887a728..2b0219f49b 100644
--- a/library/sbuf.factor
+++ b/library/sbuf.factor
@@ -26,13 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: strings
-USE: combinators
 USE: kernel
 USE: lists
 USE: math
 USE: namespaces
 USE: strings
-USE: stack
 
 : make-string ( quot -- string )
     #! Call a quotation. The quotation can call , to prepend
diff --git a/library/sdl/hsv.factor b/library/sdl/hsv.factor
index 9b03b8459a..214a5712d4 100644
--- a/library/sdl/hsv.factor
+++ b/library/sdl/hsv.factor
@@ -7,12 +7,10 @@
 ! Translated to Factor by Slava Pestov.
 
 IN: sdl
-USE: combinators
 USE: kernel
 USE: lists
 USE: math
 USE: namespaces
-USE: stack
 
 : f_ ( h s v i -- f ) >r transp >r 2dup r> 6 * r> - ;
 : p ( v s x -- v p x ) >r dupd neg succ * r> ;
diff --git a/library/sdl/sdl-utils.factor b/library/sdl/sdl-utils.factor
index a5ec8c3df3..5adcaf9398 100644
--- a/library/sdl/sdl-utils.factor
+++ b/library/sdl/sdl-utils.factor
@@ -29,15 +29,12 @@ IN: sdl
 USE: alien
 USE: math
 USE: namespaces
-USE: stack
 USE: compiler
 USE: words
 USE: parser
 USE: kernel
 USE: errors
-USE: combinators
 USE: lists
-USE: logic
 USE: prettyprint
 USE: sdl-event
 USE: sdl-gfx
diff --git a/library/sdl/sdl-video.factor b/library/sdl/sdl-video.factor
index eca6f55a3f..5f0cca88b1 100644
--- a/library/sdl/sdl-video.factor
+++ b/library/sdl/sdl-video.factor
@@ -27,12 +27,9 @@
 
 IN: sdl-video
 USE: alien
-USE: combinators
 USE: compiler
 USE: kernel
-USE: logic
 USE: math
-USE: stack
 
 ! These are the currently supported flags for the SDL_surface
 ! Available for SDL_CreateRGBSurface() or SDL_SetVideoMode()
diff --git a/library/stack.factor b/library/stack.factor
index 1152a388d8..737d7f02f1 100644
--- a/library/stack.factor
+++ b/library/stack.factor
@@ -25,7 +25,7 @@
 ! OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-IN: stack
+IN: kernel
 USE: vectors
 
 : nop ( -- ) ;
diff --git a/library/strings.factor b/library/strings.factor
index e0c18cba22..95c40b8f14 100644
--- a/library/strings.factor
+++ b/library/strings.factor
@@ -26,12 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: strings
-USE: combinators
 USE: kernel
 USE: lists
-USE: logic
 USE: math
-USE: stack
 
 : f-or-"" ( obj -- ? )
     dup not swap "" = or ;
diff --git a/library/syntax/parse-numbers.factor b/library/syntax/parse-numbers.factor
index 960b2a252d..5d5f8ba80b 100644
--- a/library/syntax/parse-numbers.factor
+++ b/library/syntax/parse-numbers.factor
@@ -26,14 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: parser
-USE: combinators
 USE: errors
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: words
 USE: unparser
diff --git a/library/syntax/parse-stream.factor b/library/syntax/parse-stream.factor
index 59a5d8a8a5..1a65dabd2a 100644
--- a/library/syntax/parse-stream.factor
+++ b/library/syntax/parse-stream.factor
@@ -26,13 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: parser
-USE: combinators
 USE: errors
 USE: kernel
 USE: lists
 USE: math
 USE: namespaces
-USE: stack
 USE: stdio
 USE: streams
 USE: strings
diff --git a/library/syntax/parse-syntax.factor b/library/syntax/parse-syntax.factor
index a7d46f7879..f287357e18 100644
--- a/library/syntax/parse-syntax.factor
+++ b/library/syntax/parse-syntax.factor
@@ -27,15 +27,12 @@
 
 IN: parser
 
-USE: combinators
 USE: errors
 USE: hashtables
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: words
 USE: vectors
diff --git a/library/syntax/parser.factor b/library/syntax/parser.factor
index e20d7cea30..816042d9a5 100644
--- a/library/syntax/parser.factor
+++ b/library/syntax/parser.factor
@@ -26,14 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: parser
-USE: combinators
 USE: errors
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: words
 USE: unparser
diff --git a/library/syntax/prettyprint.factor b/library/syntax/prettyprint.factor
index df2adac550..9ab7e29f77 100644
--- a/library/syntax/prettyprint.factor
+++ b/library/syntax/prettyprint.factor
@@ -26,15 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: prettyprint
-USE: combinators
 USE: errors
 USE: format
 USE: kernel
-USE: logic
 USE: lists
 USE: math
 USE: namespaces
-USE: stack
 USE: stdio
 USE: strings
 USE: presentation
diff --git a/library/syntax/see.factor b/library/syntax/see.factor
index 8229ad8cb6..f97cf973d6 100644
--- a/library/syntax/see.factor
+++ b/library/syntax/see.factor
@@ -26,10 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: prettyprint
-USE: combinators
+USE: kernel
 USE: lists
 USE: math
-USE: stack
 USE: stdio
 USE: strings
 USE: presentation
diff --git a/library/syntax/unparser.factor b/library/syntax/unparser.factor
index 9a38452b61..3e7098ced1 100644
--- a/library/syntax/unparser.factor
+++ b/library/syntax/unparser.factor
@@ -26,15 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: unparser
-USE: combinators
 USE: kernel
 USE: format
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
 USE: parser
-USE: stack
 USE: stdio
 USE: strings
 USE: words
diff --git a/library/test/benchmark/ack.factor b/library/test/benchmark/ack.factor
index 59bd1eab4a..2f22ea1a40 100644
--- a/library/test/benchmark/ack.factor
+++ b/library/test/benchmark/ack.factor
@@ -1,7 +1,5 @@
-USE: stack
 USE: math
 USE: kernel
-USE: combinators
 USE: compiler
 USE: test
 
diff --git a/library/test/benchmark/continuations.factor b/library/test/benchmark/continuations.factor
index 937b08ff67..39cdd2a9e4 100644
--- a/library/test/benchmark/continuations.factor
+++ b/library/test/benchmark/continuations.factor
@@ -1,6 +1,5 @@
 IN: scratchpad
-USE: combinators
-USE: continuations
+USE: kernel
 USE: math
 USE: test
 
diff --git a/library/test/benchmark/empty-loop.factor b/library/test/benchmark/empty-loop.factor
index 111b344aef..135ad5aac6 100644
--- a/library/test/benchmark/empty-loop.factor
+++ b/library/test/benchmark/empty-loop.factor
@@ -1,6 +1,7 @@
 IN: scratchpad
+USE: compiler
+USE: kernel
 USE: math
-USE: stack
 USE: test
 
 : empty-loop-1 ( n -- )
diff --git a/library/test/benchmark/fac.factor b/library/test/benchmark/fac.factor
index e22cca4170..1af33514eb 100644
--- a/library/test/benchmark/fac.factor
+++ b/library/test/benchmark/fac.factor
@@ -1,6 +1,5 @@
 IN: scratchpad
 USE: math
-USE: stack
 USE: test
 
 [ 1 ] [ 10000 fac 10000 [ succ / ] times* ] unit-test
diff --git a/library/test/benchmark/fib.factor b/library/test/benchmark/fib.factor
index 5dc327f41c..2ece5d2111 100644
--- a/library/test/benchmark/fib.factor
+++ b/library/test/benchmark/fib.factor
@@ -1,9 +1,8 @@
 IN: scratchpad
 USE: compiler
+USE: kernel
 USE: math
-USE: stack
 USE: test
-USE: combinators
 
 : fib ( n -- nth fibonacci number )
     dup 1 <= [ drop 1 ] [ pred dup fib swap pred fib + ] ifte ;
diff --git a/library/test/benchmark/hashtables.factor b/library/test/benchmark/hashtables.factor
index cbd90d97eb..373dee8c74 100644
--- a/library/test/benchmark/hashtables.factor
+++ b/library/test/benchmark/hashtables.factor
@@ -1,7 +1,6 @@
-USE: stack
 USE: strings
+USE: kernel
 USE: math
-USE: combinators
 USE: test
 USE: unparser
 USE: hashtables
diff --git a/library/test/benchmark/sort.factor b/library/test/benchmark/sort.factor
index 327b1ce5d8..79b743ec72 100644
--- a/library/test/benchmark/sort.factor
+++ b/library/test/benchmark/sort.factor
@@ -1,8 +1,8 @@
 IN: scratchpad
 USE: lists
+USE: kernel
 USE: math
 USE: random
-USE: stack
 USE: test
 
 [ ] [ [ 100000 [ 0 10000 random-int , ] times ] make-list num-sort drop ] unit-test
diff --git a/library/test/benchmark/strings.factor b/library/test/benchmark/strings.factor
index 67a1001b5c..8b48e20fb4 100644
--- a/library/test/benchmark/strings.factor
+++ b/library/test/benchmark/strings.factor
@@ -1,7 +1,6 @@
-USE: stack
 USE: strings
+USE: kernel
 USE: math
-USE: combinators
 USE: test
 USE: lists
 
diff --git a/library/test/benchmark/vectors.factor b/library/test/benchmark/vectors.factor
index 0621479dde..5060d19f20 100644
--- a/library/test/benchmark/vectors.factor
+++ b/library/test/benchmark/vectors.factor
@@ -1,5 +1,5 @@
 USE: vectors
-USE: stack
+USE: kernel
 USE: math
 USE: compiler
 USE: test
diff --git a/library/test/combinators.factor b/library/test/combinators.factor
index 9bb67eb12a..47ff9c138e 100644
--- a/library/test/combinators.factor
+++ b/library/test/combinators.factor
@@ -1,8 +1,6 @@
 IN: scratchpad
-USE: combinators
 USE: kernel
 USE: math
-USE: stack
 USE: test
 
 [ slip ] unit-test-fails
diff --git a/library/test/compiler/asm-test.factor b/library/test/compiler/asm-test.factor
index f3f7508d13..f83648cfc0 100644
--- a/library/test/compiler/asm-test.factor
+++ b/library/test/compiler/asm-test.factor
@@ -1,6 +1,5 @@
 IN: scratchpad
 USE: compiler
-USE: stack
 
 0 EAX I>R
 0 ECX I>R
diff --git a/library/test/compiler/bail-out.factor b/library/test/compiler/bail-out.factor
index 53242de9c1..0a6ea3ee4e 100644
--- a/library/test/compiler/bail-out.factor
+++ b/library/test/compiler/bail-out.factor
@@ -1,11 +1,9 @@
 IN: scratchpad
-USE: combinators
 USE: compiler
 USE: errors
-USE: logic
 USE: math
-USE: stack
 USE: test
+USE: kernel
 
 : bail-out call + ;
 
diff --git a/library/test/compiler/generic.factor b/library/test/compiler/generic.factor
index 68bac1ed33..ba99f779c5 100644
--- a/library/test/compiler/generic.factor
+++ b/library/test/compiler/generic.factor
@@ -2,10 +2,7 @@ IN: scratchpad
 USE: compiler
 USE: test
 USE: math
-USE: stack
 USE: kernel
-USE: logic
-USE: combinators
 USE: words
 
 : generic-test
diff --git a/library/test/compiler/ifte.factor b/library/test/compiler/ifte.factor
index 9fe30f155e..be661b9c8b 100644
--- a/library/test/compiler/ifte.factor
+++ b/library/test/compiler/ifte.factor
@@ -2,11 +2,9 @@ IN: scratchpad
 USE: compiler
 USE: test
 USE: math
-USE: stack
 USE: kernel
-USE: logic
-USE: combinators
 USE: words
+USE: math-internals
 
 : dummy-ifte-1 t [ ] [ ] ifte ; compiled
 
diff --git a/library/test/compiler/optimizer.factor b/library/test/compiler/optimizer.factor
index b45dfe8c24..15ab4a204c 100644
--- a/library/test/compiler/optimizer.factor
+++ b/library/test/compiler/optimizer.factor
@@ -4,7 +4,7 @@ USE: compiler
 USE: inference
 USE: words
 USE: math
-USE: combinators
+USE: kernel
 
 : foo 1 2 3 ;
 
diff --git a/library/test/compiler/simple.factor b/library/test/compiler/simple.factor
index ef296e39e3..e24b3f09d4 100644
--- a/library/test/compiler/simple.factor
+++ b/library/test/compiler/simple.factor
@@ -2,11 +2,10 @@ IN: scratchpad
 USE: compiler
 USE: test
 USE: math
-USE: stack
 USE: kernel
-USE: logic
-USE: combinators
 USE: words
+USE: kernel
+USE: math-internals
 
 : no-op ; compiled
 
diff --git a/library/test/compiler/stack.factor b/library/test/compiler/stack.factor
index 8477ca4f3f..af6f937192 100644
--- a/library/test/compiler/stack.factor
+++ b/library/test/compiler/stack.factor
@@ -1,11 +1,10 @@
 IN: scratchpad
 USE: compiler
 USE: test
-USE: stack
 USE: words
-USE: combinators
 USE: lists
 USE: math
+USE: kernel
 
 ! Make sure that stack ops compile to correct code.
 : compile-call ( quot -- word )
diff --git a/library/test/continuations.factor b/library/test/continuations.factor
index 8fb47c3cd4..22a50a65fc 100644
--- a/library/test/continuations.factor
+++ b/library/test/continuations.factor
@@ -1,11 +1,8 @@
 IN: scratchpad
-USE: combinators
-USE: continuations
 USE: kernel
 USE: lists
 USE: math
 USE: namespaces
-USE: stack
 USE: stdio
 USE: test
 
diff --git a/library/test/crashes.factor b/library/test/crashes.factor
index cf1d918046..0c8af6e019 100644
--- a/library/test/crashes.factor
+++ b/library/test/crashes.factor
@@ -4,7 +4,6 @@ USE: kernel
 USE: math
 USE: namespaces
 USE: parser
-USE: stack
 USE: strings
 USE: test
 USE: vectors
diff --git a/library/test/dataflow.factor b/library/test/dataflow.factor
index c26e2c142e..c6d1caa481 100644
--- a/library/test/dataflow.factor
+++ b/library/test/dataflow.factor
@@ -3,15 +3,14 @@ USE: inference
 USE: lists
 USE: math
 USE: test
-USE: logic
-USE: combinators
 USE: hashtables
-USE: stack
 USE: kernel
 USE: vectors
 USE: namespaces
 USE: prettyprint
 USE: words
+USE: kernel
+USE: generic
 
 : dataflow-contains-op? ( object list -- ? )
     #! Check if some dataflow node contains a given operation.
diff --git a/library/test/errors.factor b/library/test/errors.factor
index 0b16ffc7d4..e36ebaa11d 100644
--- a/library/test/errors.factor
+++ b/library/test/errors.factor
@@ -2,7 +2,6 @@ IN: scratchpad
 USE: errors
 USE: kernel
 USE: namespaces
-USE: stack
 USE: test
 USE: lists
 USE: parser
diff --git a/library/test/generic.factor b/library/test/generic.factor
index c058747936..004cbb30f7 100644
--- a/library/test/generic.factor
+++ b/library/test/generic.factor
@@ -2,8 +2,8 @@ IN: scratchpad
 USE: hashtables
 USE: namespaces
 USE: generic
-USE: stack
 USE: test
+USE: kernel
 
 TRAITS: test-traits
 C: test-traits ;C
diff --git a/library/test/hashtables.factor b/library/test/hashtables.factor
index 55edbb6cb5..663c052fc4 100644
--- a/library/test/hashtables.factor
+++ b/library/test/hashtables.factor
@@ -1,12 +1,9 @@
 IN: scratchpad
-USE: combinators
 USE: hashtables
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: test
 USE: vectors
 
diff --git a/library/test/httpd/html.factor b/library/test/httpd/html.factor
index d8d974c645..912b5fd3ff 100644
--- a/library/test/httpd/html.factor
+++ b/library/test/httpd/html.factor
@@ -5,7 +5,7 @@ USE: stdio
 USE: streams
 USE: strings
 USE: test
-USE: stack
+USE: kernel
 
 [
     "&lt;html&gt;&amp;&apos;sgml&apos;"
diff --git a/library/test/httpd/httpd.factor b/library/test/httpd/httpd.factor
index 594a6d80a7..3ad02eee91 100644
--- a/library/test/httpd/httpd.factor
+++ b/library/test/httpd/httpd.factor
@@ -8,7 +8,6 @@ USE: stdio
 USE: test
 USE: url-encoding
 USE: strings
-USE: stack
 USE: lists
 
 [ "HTTP/1.0 200 OK\nContent-Length: 12\nContent-Type: text/html\n\n" ]
diff --git a/library/test/inference.factor b/library/test/inference.factor
index 019c62b9d0..f24be3d6e9 100644
--- a/library/test/inference.factor
+++ b/library/test/inference.factor
@@ -2,12 +2,12 @@ IN: scratchpad
 USE: test
 USE: inference
 USE: math
-USE: stack
-USE: combinators
 USE: vectors
 USE: kernel
 USE: lists
 USE: namespaces
+USE: kernel
+USE: math-internals
 
 [
     [ 1 | 2 ]
diff --git a/library/test/interpreter.factor b/library/test/interpreter.factor
index 8f519aaee8..e4cd6371da 100644
--- a/library/test/interpreter.factor
+++ b/library/test/interpreter.factor
@@ -2,11 +2,10 @@ IN: scratchpad
 USE: interpreter
 USE: test
 USE: namespaces
-USE: combinators
-USE: stack
 USE: stdio
 USE: prettyprint
 USE: math
+USE: math-internals
 USE: lists
 USE: kernel
 
diff --git a/library/test/io/io.factor b/library/test/io/io.factor
index bc28b01b42..b3bb2fe0ca 100644
--- a/library/test/io/io.factor
+++ b/library/test/io/io.factor
@@ -1,7 +1,6 @@
 IN: scratchpad
 USE: namespaces
 USE: parser
-USE: stack
 USE: streams
 USE: test
 USE: stdio
diff --git a/library/test/lists/combinators.factor b/library/test/lists/combinators.factor
index a4f78f3a3e..de6815b304 100644
--- a/library/test/lists/combinators.factor
+++ b/library/test/lists/combinators.factor
@@ -1,10 +1,8 @@
 IN: scratchpad
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: test
 USE: strings
 
diff --git a/library/test/lists/lists.factor b/library/test/lists/lists.factor
index 49e951bf7e..c6f9f43b30 100644
--- a/library/test/lists/lists.factor
+++ b/library/test/lists/lists.factor
@@ -1,10 +1,8 @@
 IN: scratchpad
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: test
 USE: strings
 
diff --git a/library/test/math/bignum.factor b/library/test/math/bignum.factor
index 8e3258daea..090cba251e 100644
--- a/library/test/math/bignum.factor
+++ b/library/test/math/bignum.factor
@@ -1,8 +1,8 @@
 IN: scratchpad
-USE: stack
 USE: math
 USE: test
 USE: unparser
+USE: kernel
 
 [ -1 ] [ -1 >bignum >fixnum ] unit-test
 
diff --git a/library/test/math/bitops.factor b/library/test/math/bitops.factor
index 406611748a..9ce71dac8d 100644
--- a/library/test/math/bitops.factor
+++ b/library/test/math/bitops.factor
@@ -1,9 +1,7 @@
 IN: scratchpad
 USE: kernel
 USE: math
-USE: stack
 USE: test
-USE: logic
 USE: lists
 
 [ -2 ] [ 1 bitnot ] unit-test
diff --git a/library/test/math/complex.factor b/library/test/math/complex.factor
index 0b7f1ca797..0ee0b8bcb7 100644
--- a/library/test/math/complex.factor
+++ b/library/test/math/complex.factor
@@ -1,7 +1,6 @@
 IN: scratchpad
 USE: kernel
 USE: math
-USE: stack
 USE: test
 
 [ f ] [ #{ 5 12.5 } 5 ] [ = ] test-word
diff --git a/library/test/math/float.factor b/library/test/math/float.factor
index c45e4f458c..756451be33 100644
--- a/library/test/math/float.factor
+++ b/library/test/math/float.factor
@@ -1,7 +1,6 @@
 IN: scratchpad
 USE: kernel
 USE: math
-USE: stack
 USE: test
 
 [ t ] [ 0.0 float? ] unit-test
diff --git a/library/test/math/math-combinators.factor b/library/test/math/math-combinators.factor
index 208cf858ff..6587bdc0bc 100644
--- a/library/test/math/math-combinators.factor
+++ b/library/test/math/math-combinators.factor
@@ -1,8 +1,6 @@
 IN: scratchpad
-USE: combinators
 USE: kernel
 USE: math
-USE: stack
 USE: test
 
 [ 0 1 2 3 4 ] [ 5 [ ] times* ] unit-test
diff --git a/library/test/math/rational.factor b/library/test/math/rational.factor
index 19916dc591..48836da69b 100644
--- a/library/test/math/rational.factor
+++ b/library/test/math/rational.factor
@@ -1,7 +1,6 @@
 IN: scratchpad
 USE: kernel
 USE: math
-USE: stack
 USE: test
 USE: unparser
 
diff --git a/library/test/namespaces.factor b/library/test/namespaces.factor
index 8916be0ed0..2a95b8b40a 100644
--- a/library/test/namespaces.factor
+++ b/library/test/namespaces.factor
@@ -2,7 +2,6 @@ IN: scratchpad
 USE: kernel
 USE: namespaces
 USE: test
-USE: stack
 USE: words
 
 <namespace> "test-namespace" set
diff --git a/library/test/parser.factor b/library/test/parser.factor
index 63ea6795b0..95d44094fa 100644
--- a/library/test/parser.factor
+++ b/library/test/parser.factor
@@ -1,9 +1,9 @@
 IN: scratchpad
-USE: combinators
 USE: parser
 USE: test
 USE: unparser
 USE: lists
+USE: kernel
 
 [ [ 1 [ 2 [ 3 ] 4 ] 5 ] ]
 [ "1\n[\n2\n[\n3\n]\n4\n]\n5" ]
diff --git a/library/test/parsing-word.factor b/library/test/parsing-word.factor
index bbb18356e5..dd0ceccaef 100644
--- a/library/test/parsing-word.factor
+++ b/library/test/parsing-word.factor
@@ -2,9 +2,9 @@ IN: scratchpad
 
 USE: parser
 USE: test
-USE: stack
 USE: words
 USE: strings
+USE: kernel
 
 DEFER: foo
 
diff --git a/library/test/prettyprint.factor b/library/test/prettyprint.factor
index edd03f1a41..850ac3147a 100644
--- a/library/test/prettyprint.factor
+++ b/library/test/prettyprint.factor
@@ -3,7 +3,7 @@ USE: lists
 USE: prettyprint
 USE: test
 USE: words
-USE: stack
+USE: kernel
 
 [ ] [ gensym dup [ ] define-compound . ] unit-test
 [ ] [ vocabs [ words [ see ] each ] each ] unit-test
diff --git a/library/test/random.factor b/library/test/random.factor
index 915573ad1a..2ce6870574 100644
--- a/library/test/random.factor
+++ b/library/test/random.factor
@@ -1,11 +1,9 @@
 IN: scratchpad
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
 USE: random
-USE: stack
 USE: test
 
 [ t ]
diff --git a/library/test/sbuf.factor b/library/test/sbuf.factor
index 6b4e1ac4e0..2c22578b73 100644
--- a/library/test/sbuf.factor
+++ b/library/test/sbuf.factor
@@ -1,11 +1,8 @@
 IN: scratchpad
-USE: combinators
 USE: errors
 USE: kernel
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: test
 
diff --git a/library/test/stack.factor b/library/test/stack.factor
index 4a8da80a63..2af85684c8 100644
--- a/library/test/stack.factor
+++ b/library/test/stack.factor
@@ -1,6 +1,5 @@
 IN: scratchpad
 USE: compiler
-USE: stack
 USE: stdio
 USE: test
 
diff --git a/library/test/stream.factor b/library/test/stream.factor
index b3d8296976..fce52f384e 100644
--- a/library/test/stream.factor
+++ b/library/test/stream.factor
@@ -3,8 +3,8 @@ USE: namespaces
 USE: streams
 USE: stdio
 USE: test
-USE: stack
 USE: generic
+USE: kernel
 
 [ "xyzzy" ] [ [ "xyzzy" write ] with-string ] unit-test
 
diff --git a/library/test/strings.factor b/library/test/strings.factor
index 0ba8444abf..37556c34eb 100644
--- a/library/test/strings.factor
+++ b/library/test/strings.factor
@@ -1,11 +1,8 @@
 IN: scratchpad
-USE: combinators
 USE: errors
 USE: kernel
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 USE: test
 
diff --git a/library/test/test.factor b/library/test/test.factor
index 098cdef610..3a59d823a6 100644
--- a/library/test/test.factor
+++ b/library/test/test.factor
@@ -3,16 +3,13 @@
 ! Some of these words should be moved to the standard library.
 
 IN: test
-USE: combinators
 USE: errors
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
 USE: parser
 USE: prettyprint
-USE: stack
 USE: stdio
 USE: strings
 USE: words
diff --git a/library/test/vectors.factor b/library/test/vectors.factor
index 06f804e95c..618c40366d 100644
--- a/library/test/vectors.factor
+++ b/library/test/vectors.factor
@@ -2,7 +2,6 @@ USE: lists
 USE: kernel
 USE: math
 USE: random
-USE: stack
 USE: test
 USE: vectors
 USE: strings
diff --git a/library/test/words.factor b/library/test/words.factor
index 0f5f0c4727..675277054c 100644
--- a/library/test/words.factor
+++ b/library/test/words.factor
@@ -3,9 +3,7 @@ USE: math
 USE: test
 USE: words
 USE: namespaces
-USE: logic
 USE: lists
-USE: stack
 USE: kernel
 
 [ 4 ] [
diff --git a/library/threads.factor b/library/threads.factor
index 23b8ef35b9..cdf9239fd9 100644
--- a/library/threads.factor
+++ b/library/threads.factor
@@ -26,12 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: threads
-USE: combinators
-USE: continuations
 USE: io-internals
 USE: kernel
 USE: lists
-USE: stack
 
 ! Core of the multitasker. Used by io-internals.factor and
 ! in-thread.factor.
diff --git a/library/tools/debugger.factor b/library/tools/debugger.factor
index 5fd7bcf0a7..3597e15a56 100644
--- a/library/tools/debugger.factor
+++ b/library/tools/debugger.factor
@@ -26,14 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: errors
-USE: combinators
-USE: continuations
 USE: kernel
 USE: lists
-USE: logic
 USE: namespaces
 USE: prettyprint
-USE: stack
 USE: stdio
 USE: strings
 USE: unparser
diff --git a/library/tools/heap-stats.factor b/library/tools/heap-stats.factor
index 5677881f53..0fb8fb8d9a 100644
--- a/library/tools/heap-stats.factor
+++ b/library/tools/heap-stats.factor
@@ -26,13 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: listener
-USE: combinators
 USE: kernel
 USE: lists
 USE: math
 USE: namespaces
 USE: prettyprint
-USE: stack
 USE: stdio
 USE: words
 USE: vectors
diff --git a/library/tools/inspector.factor b/library/tools/inspector.factor
index 88ab5e3b86..afd8c5ac0a 100644
--- a/library/tools/inspector.factor
+++ b/library/tools/inspector.factor
@@ -26,13 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: inspector
-USE: combinators
 USE: format
 USE: kernel
 USE: hashtables
 USE: lists
 USE: namespaces
-USE: stack
 USE: stdio
 USE: strings
 USE: presentation
diff --git a/library/tools/interpreter.factor b/library/tools/interpreter.factor
index f48a85b43c..e356dcaba4 100644
--- a/library/tools/interpreter.factor
+++ b/library/tools/interpreter.factor
@@ -28,14 +28,10 @@
 IN: interpreter
 USE: vectors
 USE: namespaces
-USE: logic
 USE: kernel
-USE: combinators
 USE: lists
 USE: words
-USE: stack
 USE: errors
-USE: continuations
 USE: strings
 USE: prettyprint
 USE: stdio
diff --git a/library/tools/jedit-wire.factor b/library/tools/jedit-wire.factor
index c130eaa389..b851c698d2 100644
--- a/library/tools/jedit-wire.factor
+++ b/library/tools/jedit-wire.factor
@@ -26,13 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: jedit
-USE: combinators
+USE: kernel
 USE: lists
 USE: namespaces
 USE: parser
 USE: presentation
 USE: prettyprint
-USE: stack
 USE: stdio
 USE: streams
 USE: strings
diff --git a/library/tools/jedit.factor b/library/tools/jedit.factor
index 5ab06ec9f8..1c06d2237f 100644
--- a/library/tools/jedit.factor
+++ b/library/tools/jedit.factor
@@ -26,12 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: jedit
-USE: combinators
+USE: kernel
 USE: lists
-USE: logic
 USE: namespaces
 USE: parser
-USE: stack
 USE: streams
 USE: stdio
 USE: strings
diff --git a/library/tools/listener.factor b/library/tools/listener.factor
index 3963827711..a9f7493a18 100644
--- a/library/tools/listener.factor
+++ b/library/tools/listener.factor
@@ -26,16 +26,12 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: listener
-USE: combinators
-USE: continuations
 USE: errors
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
 USE: parser
-USE: stack
 USE: stdio
 USE: strings
 USE: presentation
diff --git a/library/tools/profiler.factor b/library/tools/profiler.factor
index d996448f54..8a910ed199 100644
--- a/library/tools/profiler.factor
+++ b/library/tools/profiler.factor
@@ -26,13 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: profiler
-USE: combinators
 USE: kernel
 USE: lists
 USE: math
 USE: namespaces
 USE: prettyprint
-USE: stack
 USE: words
 USE: vectors
 
diff --git a/library/tools/telnetd.factor b/library/tools/telnetd.factor
index 813961f628..a691ca5399 100644
--- a/library/tools/telnetd.factor
+++ b/library/tools/telnetd.factor
@@ -26,14 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: telnetd
-USE: combinators
 USE: errors
 USE: listener
 USE: kernel
 USE: logging
-USE: logic
 USE: namespaces
-USE: stack
 USE: stdio
 USE: streams
 USE: threads
diff --git a/library/tools/word-tools.factor b/library/tools/word-tools.factor
index 4525eb40fa..6c20e20750 100644
--- a/library/tools/word-tools.factor
+++ b/library/tools/word-tools.factor
@@ -26,13 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: words
-USE: combinators
 USE: inspector
 USE: lists
 USE: kernel
 USE: namespaces
 USE: prettyprint
-USE: stack
 USE: stdio
 USE: strings
 USE: unparser
diff --git a/library/vector-combinators.factor b/library/vector-combinators.factor
index 17d194f678..f052b09c1f 100644
--- a/library/vector-combinators.factor
+++ b/library/vector-combinators.factor
@@ -26,12 +26,9 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: vectors
-USE: combinators
 USE: kernel
 USE: lists
-USE: logic
 USE: math
-USE: stack
 
 : vector-each ( vector code -- )
     #! Execute the code, with each element of the vector
diff --git a/library/vectors.factor b/library/vectors.factor
index ccd498df92..fe288b40d4 100644
--- a/library/vectors.factor
+++ b/library/vectors.factor
@@ -29,8 +29,6 @@ IN: vectors
 USE: kernel
 USE: lists
 USE: math
-USE: stack
-USE: combinators
 
 : 2vector-nth ( n vec vec -- obj obj )
     >r over >r vector-nth r> r> vector-nth ;
diff --git a/library/vocabularies.factor b/library/vocabularies.factor
index 998447492f..b0b184d10f 100644
--- a/library/vocabularies.factor
+++ b/library/vocabularies.factor
@@ -26,11 +26,10 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: words
-USE: combinators
 USE: hashtables
+USE: kernel
 USE: lists
 USE: namespaces
-USE: stack
 
 : (search) ( name vocab -- word )
     vocab dup [ hash ] [ 2drop f ] ifte ;
diff --git a/library/words.factor b/library/words.factor
index bcbf1079ae..f146f40895 100644
--- a/library/words.factor
+++ b/library/words.factor
@@ -26,14 +26,11 @@
 ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 IN: words
-USE: combinators
 USE: hashtables
 USE: kernel
 USE: lists
-USE: logic
 USE: math
 USE: namespaces
-USE: stack
 USE: strings
 
 : word-property ( word pname -- pvalue )
@@ -104,9 +101,7 @@ USE: strings
         "user"
         "arithmetic"
         "builtins"
-        "combinators"
         "compiler"
-        "continuations"
         "debugger"
         "errors"
         "files"
@@ -119,7 +114,6 @@ USE: strings
         "kernel"
         "listener"
         "lists"
-        "logic"
         "math"
         "namespaces"
         "parser"