From 54874801265a5ce38e9fd6b193113ba4bb7b5694 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Tue, 5 Mar 2013 10:34:47 -0800
Subject: [PATCH] core: cleanup USING lists.

---
 core/alien/strings/strings.factor            |  8 ++++----
 core/bootstrap/layouts/layouts.factor        |  6 ++----
 core/byte-arrays/byte-arrays.factor          |  4 ++--
 core/byte-vectors/byte-vectors.factor        |  4 ++--
 core/checksums/crc32/crc32.factor            |  5 ++---
 core/destructors/destructors.factor          |  4 ++--
 core/effects/effects.factor                  |  5 ++---
 core/graphs/graphs.factor                    |  2 +-
 core/growable/growable.factor                |  4 ++--
 core/hash-sets/hash-sets.factor              |  5 ++---
 core/hashtables/hashtables.factor            |  4 ++--
 core/init/init.factor                        |  4 ++--
 core/io/backend/backend.factor               |  4 ++--
 core/io/files/files.factor                   |  6 +++---
 core/io/io.factor                            |  4 ++--
 core/io/streams/byte-array/byte-array.factor |  4 ++--
 core/io/streams/c/c.factor                   |  7 +++----
 core/io/streams/memory/memory.factor         |  2 +-
 core/io/streams/plain/plain.factor           |  2 +-
 core/io/streams/sequence/sequence.factor     |  5 +++--
 core/layouts/layouts.factor                  |  3 +--
 core/lexer/lexer.factor                      |  6 +++---
 core/math/integers/integers.factor           |  4 ++--
 core/parser/parser.factor                    | 11 +++++------
 core/quotations/quotations.factor            |  5 ++---
 core/sbufs/sbufs.factor                      |  4 ++--
 core/sorting/sorting.factor                  |  4 ++--
 core/source-files/errors/errors.factor       |  4 ++--
 core/source-files/source-files.factor        |  9 ++++-----
 core/splitting/splitting.factor              |  2 +-
 core/strings/parser/parser.factor            |  3 +--
 core/strings/strings.factor                  |  5 +++--
 core/syntax/syntax.factor                    | 20 ++++++++++----------
 core/vectors/vectors.factor                  |  4 ++--
 core/vocabs/parser/parser.factor             |  7 +++----
 core/vocabs/vocabs.factor                    |  2 +-
 core/words/alias/alias.factor                |  5 +++--
 core/words/constant/constant.factor          |  2 +-
 core/words/symbol/symbol.factor              |  2 +-
 core/words/words.factor                      |  7 +++----
 40 files changed, 94 insertions(+), 104 deletions(-)

diff --git a/core/alien/strings/strings.factor b/core/alien/strings/strings.factor
index 8594cf2f9b..346ad45673 100644
--- a/core/alien/strings/strings.factor
+++ b/core/alien/strings/strings.factor
@@ -1,9 +1,9 @@
 ! Copyright (C) 2008, 2011 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays sequences kernel kernel.private accessors math
-alien.accessors byte-arrays io io.encodings io.encodings.utf8
-io.encodings.utf16n io.streams.byte-array io.streams.memory system
-system.private alien strings combinators namespaces init ;
+USING: accessors alien arrays byte-arrays init io io.encodings
+io.encodings.utf16n io.encodings.utf8 io.streams.byte-array
+io.streams.memory kernel kernel.private namespaces sequences
+strings system system.private ;
 IN: alien.strings
 
 GENERIC# alien>string 1 ( c-ptr encoding -- string/f )
diff --git a/core/bootstrap/layouts/layouts.factor b/core/bootstrap/layouts/layouts.factor
index e139faa505..7ac8a8590d 100644
--- a/core/bootstrap/layouts/layouts.factor
+++ b/core/bootstrap/layouts/layouts.factor
@@ -1,9 +1,7 @@
 ! Copyright (C) 2007, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces math words kernel alien byte-arrays
-hashtables vectors strings sbufs arrays
-quotations assocs layouts classes.tuple.private
-kernel.private ;
+USING: alien arrays byte-arrays kernel layouts math namespaces
+quotations strings words ;
 
 16 data-alignment set
 
diff --git a/core/byte-arrays/byte-arrays.factor b/core/byte-arrays/byte-arrays.factor
index f9c6280091..d4d2d95cf2 100644
--- a/core/byte-arrays/byte-arrays.factor
+++ b/core/byte-arrays/byte-arrays.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel kernel.private alien.accessors sequences
-sequences.private math ;
+USING: accessors alien.accessors kernel math sequences
+sequences.private ;
 IN: byte-arrays
 
 M: byte-array clone (clone) ; inline
diff --git a/core/byte-vectors/byte-vectors.factor b/core/byte-vectors/byte-vectors.factor
index e4bc48f691..54f464a9dc 100644
--- a/core/byte-vectors/byte-vectors.factor
+++ b/core/byte-vectors/byte-vectors.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays kernel kernel.private math sequences
-sequences.private growable byte-arrays accessors ;
+USING: accessors byte-arrays growable kernel math sequences
+sequences.private ;
 IN: byte-vectors
 
 TUPLE: byte-vector
diff --git a/core/checksums/crc32/crc32.factor b/core/checksums/crc32/crc32.factor
index 415317c813..da3df72974 100644
--- a/core/checksums/crc32/crc32.factor
+++ b/core/checksums/crc32/crc32.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2006 Doug Coleman
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math sequences sequences.private namespaces
-words io io.binary io.files quotations
-definitions checksums ;
+USING: checksums io.binary kernel math sequences
+sequences.private ;
 IN: checksums.crc32
 
 CONSTANT: crc32-polynomial 0xedb88320
diff --git a/core/destructors/destructors.factor b/core/destructors/destructors.factor
index 5f8e7b48f0..697bc2eeef 100755
--- a/core/destructors/destructors.factor
+++ b/core/destructors/destructors.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2010 Doug Coleman, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors continuations kernel namespaces make
-sequences vectors sets assocs init math ;
+USING: accessors assocs continuations init kernel make
+namespaces sequences sets ;
 FROM: namespaces => set ;
 IN: destructors
 
diff --git a/core/effects/effects.factor b/core/effects/effects.factor
index 1ac78fcae8..46bd9eeaa9 100644
--- a/core/effects/effects.factor
+++ b/core/effects/effects.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2006, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.parser math.order namespaces make
-sequences strings words assocs combinators accessors arrays
-quotations classes.algebra classes ;
+USING: accessors arrays classes combinators kernel make math
+math.order math.parser sequences strings words ;
 IN: effects
 
 TUPLE: effect
diff --git a/core/graphs/graphs.factor b/core/graphs/graphs.factor
index e35e29ff14..eed2a69c33 100644
--- a/core/graphs/graphs.factor
+++ b/core/graphs/graphs.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006, 2007 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs kernel namespaces sequences sets ;
+USING: assocs kernel sequences sets ;
 IN: graphs
 
 <PRIVATE
diff --git a/core/growable/growable.factor b/core/growable/growable.factor
index 0144cdf58f..8903187fbd 100644
--- a/core/growable/growable.factor
+++ b/core/growable/growable.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel kernel.private math math.private
-sequences sequences.private ;
+USING: accessors kernel math math.private sequences
+sequences.private ;
 IN: growable
 
 MIXIN: growable
diff --git a/core/hash-sets/hash-sets.factor b/core/hash-sets/hash-sets.factor
index aa35a17ab0..62fe7d016a 100644
--- a/core/hash-sets/hash-sets.factor
+++ b/core/hash-sets/hash-sets.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2010 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs hashtables kernel sets sets.private
-sequences parser ;
-
+USING: accessors assocs hashtables kernel sequences sets
+sets.private ;
 IN: hash-sets
 
 ! In a better implementation, less memory would be used
diff --git a/core/hashtables/hashtables.factor b/core/hashtables/hashtables.factor
index 4194fc796a..57dae0171f 100644
--- a/core/hashtables/hashtables.factor
+++ b/core/hashtables/hashtables.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2011 John Benediktsson, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays kernel kernel.private slots.private math
-assocs math.private sequences sequences.private vectors ;
+USING: accessors arrays assocs kernel kernel.private math
+math.private sequences sequences.private slots.private vectors ;
 IN: hashtables
 
 TUPLE: hashtable
diff --git a/core/init/init.factor b/core/init/init.factor
index dfec564298..d7554aee2f 100644
--- a/core/init/init.factor
+++ b/core/init/init.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2004, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: continuations continuations.private kernel
-kernel.private sequences assocs namespaces namespaces.private ;
+USING: assocs continuations continuations.private kernel
+kernel.private namespaces ;
 IN: init
 
 SYMBOL: startup-hooks
diff --git a/core/io/backend/backend.factor b/core/io/backend/backend.factor
index 45425653e3..49bcee73be 100644
--- a/core/io/backend/backend.factor
+++ b/core/io/backend/backend.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: init kernel system namespaces io io.encodings
-io.encodings.utf8 assocs splitting alien ;
+USING: assocs init io io.encodings io.encodings.utf8 kernel
+namespaces system ;
 IN: io.backend
 
 SYMBOL: io-backend
diff --git a/core/io/files/files.factor b/core/io/files/files.factor
index 02100bae5b..a5e005745a 100644
--- a/core/io/files/files.factor
+++ b/core/io/files/files.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2004, 2009 Slava Pestov, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel kernel.private sequences init namespaces system io
-io.encodings.utf8 io.backend io.pathnames io.encodings io.files.private
-alien.strings splitting ;
+USING: alien.strings init io io.backend io.encodings
+io.encodings.utf8 io.files.private io.pathnames kernel
+kernel.private namespaces sequences splitting system ;
 IN: io.files
 
 MIXIN: file-reader
diff --git a/core/io/io.factor b/core/io/io.factor
index 2485716165..83414ec551 100644
--- a/core/io/io.factor
+++ b/core/io/io.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2003, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators destructors kernel kernel.private math
-namespaces sequences sequences.private ;
+USING: destructors kernel kernel.private math namespaces
+sequences sequences.private ;
 IN: io
 
 SYMBOLS: +byte+ +character+ ;
diff --git a/core/io/streams/byte-array/byte-array.factor b/core/io/streams/byte-array/byte-array.factor
index 930bee2239..e9186c03fe 100644
--- a/core/io/streams/byte-array/byte-array.factor
+++ b/core/io/streams/byte-array/byte-array.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008, 2009 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors byte-arrays byte-vectors destructors io
-io.encodings io.private io.streams.sequence kernel namespaces
-sequences sequences.private ;
+io.encodings io.streams.sequence kernel namespaces sequences
+sequences.private ;
 IN: io.streams.byte-array
 
 INSTANCE: byte-vector output-stream
diff --git a/core/io/streams/c/c.factor b/core/io/streams/c/c.factor
index 5804360087..4582f5f4f3 100644
--- a/core/io/streams/c/c.factor
+++ b/core/io/streams/c/c.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2004, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.strings kernel kernel.private namespaces make
-io io.encodings sequences math generic threads.private classes
-io.backend io.files io.encodings.utf8 continuations destructors
-byte-arrays accessors combinators ;
+USING: accessors alien alien.strings byte-arrays destructors io
+io.backend io.encodings.utf8 io.files kernel kernel.private
+make math sequences threads.private ;
 IN: io.streams.c
 
 TUPLE: c-stream < disposable handle ;
diff --git a/core/io/streams/memory/memory.factor b/core/io/streams/memory/memory.factor
index 9e07143839..142dd7a07f 100644
--- a/core/io/streams/memory/memory.factor
+++ b/core/io/streams/memory/memory.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel accessors alien alien.accessors math io ;
+USING: accessors alien alien.accessors io kernel ;
 IN: io.streams.memory
 
 TUPLE: memory-stream alien ;
diff --git a/core/io/streams/plain/plain.factor b/core/io/streams/plain/plain.factor
index 9cd18adcc6..4ea1996f88 100644
--- a/core/io/streams/plain/plain.factor
+++ b/core/io/streams/plain/plain.factor
@@ -6,4 +6,4 @@ IN: io.streams.plain
 MIXIN: plain-writer
 
 M: plain-writer stream-nl
-    CHAR: \n swap stream-write1 ;
\ No newline at end of file
+    CHAR: \n swap stream-write1 ;
diff --git a/core/io/streams/sequence/sequence.factor b/core/io/streams/sequence/sequence.factor
index 8894fdf322..47a006cbb1 100644
--- a/core/io/streams/sequence/sequence.factor
+++ b/core/io/streams/sequence/sequence.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2009 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: sequences io io.streams.plain kernel accessors math math.order
-growable destructors combinators sequences.private io.private ;
+USING: accessors combinators destructors growable io io.private
+io.streams.plain kernel math math.order sequences
+sequences.private ;
 IN: io.streams.sequence
 
 ! Readers
diff --git a/core/layouts/layouts.factor b/core/layouts/layouts.factor
index e6e238eefd..2e2b1fe680 100644
--- a/core/layouts/layouts.factor
+++ b/core/layouts/layouts.factor
@@ -1,7 +1,6 @@
 ! Copyright (C) 2007, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces math words kernel assocs classes
-math.order kernel.private sequences sequences.private ;
+USING: assocs kernel kernel.private math math.order namespaces ;
 IN: layouts
 
 SYMBOL: data-alignment
diff --git a/core/lexer/lexer.factor b/core/lexer/lexer.factor
index f91c5e79cb..1e9c7a28c2 100644
--- a/core/lexer/lexer.factor
+++ b/core/lexer/lexer.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008, 2010 Slava Pestov, Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel sequences accessors namespaces math words strings
-io vectors arrays math.parser combinators continuations
-source-files.errors ;
+USING: accessors arrays combinators continuations io kernel
+math math.parser namespaces sequences source-files.errors
+strings vectors ;
 IN: lexer
 
 TUPLE: lexer
diff --git a/core/math/integers/integers.factor b/core/math/integers/integers.factor
index b2b4f9e157..0f777055fd 100644
--- a/core/math/integers/integers.factor
+++ b/core/math/integers/integers.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2004, 2010 Slava Pestov.
 ! Copyright (C) 2008, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel kernel.private sequences sequences.private math
-math.private math.order combinators ;
+USING: combinators kernel kernel.private math math.order
+math.private ;
 IN: math.integers.private
 
 : fixnum-min ( x y -- z ) [ fixnum< ] most ; foldable
diff --git a/core/parser/parser.factor b/core/parser/parser.factor
index 873ca9db4c..9124067335 100644
--- a/core/parser/parser.factor
+++ b/core/parser/parser.factor
@@ -1,11 +1,10 @@
 ! Copyright (C) 2005, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays definitions generic assocs kernel math namespaces
-sequences strings vectors words words.symbol quotations io
-combinators sorting splitting math.parser effects continuations
-io.files vocabs io.encodings.utf8 source-files classes
-hashtables compiler.units accessors sets lexer vocabs.parser
-slots parser.notes classes.algebra ;
+USING: accessors arrays assocs classes combinators
+compiler.units continuations definitions effects io
+io.encodings.utf8 io.files kernel lexer math.parser namespaces
+parser.notes quotations sequences slots source-files vectors
+vocabs vocabs.parser words words.symbol ;
 IN: parser
 
 : location ( -- loc )
diff --git a/core/quotations/quotations.factor b/core/quotations/quotations.factor
index 9b85289bd6..7e7a77d4e1 100644
--- a/core/quotations/quotations.factor
+++ b/core/quotations/quotations.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2006, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays sequences sequences.private
-kernel kernel.private math assocs quotations.private
-slots.private ;
+USING: accessors arrays kernel kernel.private math sequences
+sequences.private slots.private ;
 IN: quotations
 
 <PRIVATE
diff --git a/core/sbufs/sbufs.factor b/core/sbufs/sbufs.factor
index a628ab35a1..d90ae75108 100644
--- a/core/sbufs/sbufs.factor
+++ b/core/sbufs/sbufs.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel math sequences.private sequences
-strings growable strings.private ;
+USING: accessors growable kernel math sequences
+sequences.private strings strings.private ;
 IN: sbufs
 
 TUPLE: sbuf
diff --git a/core/sorting/sorting.factor b/core/sorting/sorting.factor
index c1719f6152..29bcafae20 100644
--- a/core/sorting/sorting.factor
+++ b/core/sorting/sorting.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays assocs kernel math vectors math.order
-sequences sequences.private ;
+USING: accessors arrays assocs kernel math math.order sequences
+sequences.private vectors ;
 IN: sorting
 
 ! Optimized merge-sort:
diff --git a/core/source-files/errors/errors.factor b/core/source-files/errors/errors.factor
index b3b6daee59..5077ec0b67 100644
--- a/core/source-files/errors/errors.factor
+++ b/core/source-files/errors/errors.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs kernel math.order sorting sequences definitions
-namespaces arrays splitting io math.parser math init continuations ;
+USING: accessors assocs continuations definitions init io
+kernel math math.parser namespaces sequences sorting ;
 IN: source-files.errors
 
 GENERIC: error-file ( error -- file )
diff --git a/core/source-files/source-files.factor b/core/source-files/source-files.factor
index 6807e51515..13e93f0582 100644
--- a/core/source-files/source-files.factor
+++ b/core/source-files/source-files.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2007, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays definitions generic assocs kernel math namespaces
-sequences strings vectors words quotations io io.files
-io.pathnames combinators sorting splitting math.parser effects
-continuations checksums checksums.crc32 vocabs hashtables
-compiler.units io.encodings.utf8 accessors source-files.errors ;
+USING: accessors arrays assocs checksums checksums.crc32
+compiler.units continuations definitions io.encodings.utf8
+io.files io.pathnames kernel namespaces sequences
+source-files.errors strings words ;
 IN: source-files
 
 SYMBOL: source-files
diff --git a/core/splitting/splitting.factor b/core/splitting/splitting.factor
index 65125eed46..d2348b9e6b 100644
--- a/core/splitting/splitting.factor
+++ b/core/splitting/splitting.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays kernel make math sequences sets strings ;
+USING: arrays kernel make math sequences strings ;
 IN: splitting
 
 <PRIVATE
diff --git a/core/strings/parser/parser.factor b/core/strings/parser/parser.factor
index 037b0ad52f..7544be1da7 100644
--- a/core/strings/parser/parser.factor
+++ b/core/strings/parser/parser.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2008, 2009 Slava Pestov, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators kernel lexer make
-math math.order math.parser namespaces parser sequences
-splitting strings ;
+math math.parser namespaces sequences splitting strings ;
 IN: strings.parser
 
 ERROR: bad-escape char ;
diff --git a/core/strings/strings.factor b/core/strings/strings.factor
index f0e589b7db..83a44d0f14 100644
--- a/core/strings/strings.factor
+++ b/core/strings/strings.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2003, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.accessors byte-arrays kernel math.private
-sequences kernel.private math sequences.private slots.private ;
+USING: accessors alien.accessors byte-arrays kernel
+kernel.private math math.private sequences sequences.private
+slots.private ;
 IN: strings
 
 <PRIVATE
diff --git a/core/syntax/syntax.factor b/core/syntax/syntax.factor
index 441a4dfb7d..78a14f68fc 100644
--- a/core/syntax/syntax.factor
+++ b/core/syntax/syntax.factor
@@ -1,15 +1,15 @@
 ! Copyright (C) 2004, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien arrays byte-arrays byte-vectors definitions generic
-hashtables kernel math namespaces parser lexer sequences strings
-strings.parser sbufs vectors words words.symbol words.constant
-words.alias quotations io assocs splitting classes.tuple
-generic.standard generic.hook generic.math generic.parser classes
-io.pathnames vocabs vocabs.parser classes.parser classes.union
-classes.intersection classes.mixin classes.predicate
-classes.singleton classes.tuple.parser compiler.units classes.maybe
-combinators effects.parser slots hash-sets source-files
-classes.algebra.private ;
+USING: accessors arrays byte-arrays byte-vectors
+classes.algebra.private classes.intersection classes.maybe
+classes.mixin classes.parser classes.predicate
+classes.singleton classes.tuple classes.tuple.parser
+classes.union combinators compiler.units definitions
+effects.parser generic generic.hook generic.math generic.parser
+generic.standard hash-sets hashtables io.pathnames kernel lexer
+math namespaces parser quotations sbufs sequences slots
+source-files splitting strings strings.parser vectors
+vocabs.parser words words.alias words.constant words.symbol ;
 IN: bootstrap.syntax
 
 ! These words are defined as a top-level form, instead of with
diff --git a/core/vectors/vectors.factor b/core/vectors/vectors.factor
index e9def85fbb..c1bffbb9a1 100644
--- a/core/vectors/vectors.factor
+++ b/core/vectors/vectors.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays kernel math sequences sequences.private growable
-accessors ;
+USING: accessors arrays growable kernel math sequences
+sequences.private ;
 IN: vectors
 
 TUPLE: vector
diff --git a/core/vocabs/parser/parser.factor b/core/vocabs/parser/parser.factor
index dccf1f1be6..83a1831eab 100644
--- a/core/vocabs/parser/parser.factor
+++ b/core/vocabs/parser/parser.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2007, 2010 Daniel Ehrenberg, Bruno Deferrari,
 ! Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: assocs hashtables kernel namespaces sequences
-sets strings vocabs sorting accessors arrays compiler.units
-combinators vectors splitting continuations math words
-parser.notes ;
+USING: accessors arrays assocs combinators compiler.units
+continuations hashtables kernel math namespaces parser.notes
+sequences sets sorting splitting vectors vocabs words ;
 IN: vocabs.parser
 
 ERROR: no-word-error name ;
diff --git a/core/vocabs/vocabs.factor b/core/vocabs/vocabs.factor
index f86dcda135..256b15601f 100644
--- a/core/vocabs/vocabs.factor
+++ b/core/vocabs/vocabs.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2009 Eduardo Cavazos, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs definitions kernel namespaces sequences
-sets sorting splitting strings ;
+sorting splitting strings ;
 IN: vocabs
 
 SYMBOL: dictionary
diff --git a/core/words/alias/alias.factor b/core/words/alias/alias.factor
index 73e270dffc..71118d9c93 100644
--- a/core/words/alias/alias.factor
+++ b/core/words/alias/alias.factor
@@ -1,6 +1,7 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: quotations effects accessors sequences words kernel definitions ;
+USING: accessors definitions effects kernel quotations
+sequences words ;
 IN: words.alias
 
 PREDICATE: alias < word "alias" word-prop ;
@@ -14,4 +15,4 @@ M: alias reset-word
 
 M: alias definer drop \ ALIAS: f ;
 
-M: alias definition def>> first 1quotation ;
\ No newline at end of file
+M: alias definition def>> first 1quotation ;
diff --git a/core/words/constant/constant.factor b/core/words/constant/constant.factor
index 30503bc92f..0d45bbb0fd 100644
--- a/core/words/constant/constant.factor
+++ b/core/words/constant/constant.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel sequences words definitions quotations ;
+USING: definitions kernel quotations words ;
 IN: words.constant
 
 PREDICATE: constant < word "constant" word-prop >boolean ;
diff --git a/core/words/symbol/symbol.factor b/core/words/symbol/symbol.factor
index fdb7e862ca..0d94ea5abe 100644
--- a/core/words/symbol/symbol.factor
+++ b/core/words/symbol/symbol.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel sequences accessors definitions words ;
+USING: accessors definitions kernel sequences words ;
 IN: words.symbol
 
 PREDICATE: symbol < word
diff --git a/core/words/words.factor b/core/words/words.factor
index d338d7f576..c17f265753 100644
--- a/core/words/words.factor
+++ b/core/words/words.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2004, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors arrays definitions kernel kernel.private
-slots.private math namespaces sequences strings vectors sbufs
-quotations assocs hashtables sorting vocabs math.order sets
-words.private ;
+USING: accessors arrays assocs definitions hashtables kernel
+kernel.private math math.order namespaces quotations sequences
+slots.private strings vocabs ;
 FROM: assocs => change-at ;
 IN: words