diff --git a/basis/compiler/tests/linkage-errors.factor b/basis/compiler/tests/linkage-errors.factor
index ca9b694644..27040f420f 100644
--- a/basis/compiler/tests/linkage-errors.factor
+++ b/basis/compiler/tests/linkage-errors.factor
@@ -1,6 +1,6 @@
 USING: tools.test namespaces assocs alien.syntax kernel
 compiler.errors accessors alien alien.c-types alien.strings
-debugger literals ;
+debugger literals kernel.private ;
 FROM: alien.libraries => add-library load-library ;
 IN: compiler.tests.linkage-errors
 
diff --git a/basis/debugger/debugger.factor b/basis/debugger/debugger.factor
index 8ff06fda29..84ad2d2dce 100755
--- a/basis/debugger/debugger.factor
+++ b/basis/debugger/debugger.factor
@@ -5,11 +5,11 @@ classes.builtin classes.mixin classes.tuple classes.tuple.parser
 combinators combinators.short-circuit compiler.units
 continuations definitions destructors effects.parser generic
 generic.math generic.parser generic.single grouping io
-io.encodings io.styles kernel lexer make math math.order
-math.parser namespaces parser prettyprint sequences
+io.encodings io.styles kernel kernel.private lexer make math
+math.order math.parser namespaces parser prettyprint sequences
 sequences.private slots source-files.errors strings
-strings.parser summary system vocabs vocabs.loader vocabs.parser
-words ;
+strings.parser summary system vocabs vocabs.loader
+vocabs.parser words ;
 FROM: namespaces => change-global ;
 IN: debugger
 
diff --git a/basis/math/floats/env/env-tests.factor b/basis/math/floats/env/env-tests.factor
index 3de8c2bf0a..af02a9ddd0 100755
--- a/basis/math/floats/env/env-tests.factor
+++ b/basis/math/floats/env/env-tests.factor
@@ -1,7 +1,7 @@
 USING: kernel math math.floats.env math.floats.env.private
 math.functions math.libm literals sequences tools.test locals
 compiler.units kernel.private fry compiler.test math.private
-words system memory ;
+words system memory kernel.private ;
 IN: math.floats.env.tests
 
 : set-default-fp-env ( -- )
diff --git a/core/kernel/kernel-tests.factor b/core/kernel/kernel-tests.factor
index 9776b23f25..c2fc444510 100644
--- a/core/kernel/kernel-tests.factor
+++ b/core/kernel/kernel-tests.factor
@@ -2,7 +2,7 @@ USING: arrays byte-arrays kernel kernel.private literals math
 memory namespaces sequences tools.test math.private quotations
 continuations prettyprint io.streams.string debugger assocs
 sequences.private accessors locals.backend grouping words
-system alien alien.accessors ;
+system alien alien.accessors kernel.private ;
 IN: kernel.tests
 
 [ 0 ] [ f size ] unit-test
diff --git a/core/kernel/kernel.factor b/core/kernel/kernel.factor
index 413e7fc67e..d0336d907a 100644
--- a/core/kernel/kernel.factor
+++ b/core/kernel/kernel.factor
@@ -363,11 +363,11 @@ CONSTANT: CONTEXT-OBJ-CATCHSTACK 1
 CONSTANT: CONTEXT-OBJ-CONTEXT 2
 CONSTANT: CONTEXT-OBJ-IN-CALLBACK-P 3
 
-PRIVATE>
-
 ! Runtime errors must be kept in sync with:
 !   vm/errors.hpp
+
 CONSTANT: kernel-error-count 19
+
 CONSTANT: ERROR-EXPIRED 0
 CONSTANT: ERROR-IO      1
 CONSTANT: ERROR-NOT-IMPLEMENTED 2
@@ -387,3 +387,5 @@ CONSTANT: ERROR-CALLSTACK-OVERFLOW 15
 CONSTANT: ERROR-MEMORY 16
 CONSTANT: ERROR-FP-TRAP 17
 CONSTANT: ERROR-INTERRUPT 18
+
+PRIVATE>
diff --git a/core/strings/strings-tests.factor b/core/strings/strings-tests.factor
index fea72f1e08..80fc085bb2 100644
--- a/core/strings/strings-tests.factor
+++ b/core/strings/strings-tests.factor
@@ -1,6 +1,6 @@
 USING: continuations kernel literals math math.order namespaces make
 strings strings.private sbufs tools.test sequences vectors
-arrays memory prettyprint io.streams.null ;
+arrays memory prettyprint io.streams.null kernel.private ;
 IN: strings.tests
 
 [ CHAR: b ] [ 1 >bignum "abc" nth ] unit-test
diff --git a/extra/decimals/decimals-tests.factor b/extra/decimals/decimals-tests.factor
index 20f86eae40..3b6ff627db 100644
--- a/extra/decimals/decimals-tests.factor
+++ b/extra/decimals/decimals-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: continuations decimals grouping kernel literals locals
 math math.functions math.order math.ratios prettyprint random
-sequences tools.test ;
+sequences tools.test kernel.private ;
 IN: decimals.tests
 
 [ t ] [