More module system tweaks

contrib/aim/load.factor

@@ -1,6 +1,3 @@
-IN: scratchpad
-USING: kernel parser sequences words compiler ;
-
 REQUIRE: crypto ;
 
 PROVIDE: aim { "net-bytes.factor" "aim.factor" } ;

contrib/all.factor

@@ -1,7 +1,7 @@
 USING: modules words  ;
 
 REQUIRE: aim cairo concurrency coroutines crypto dlists
-gap-buffer httpd math postgresql process random-tester
+embedded gap-buffer httpd math postgresql process random-tester
 splay-trees sqlite units ;
 
 "x11" vocab [

contrib/cairo/load.factor

@@ -1,8 +1,5 @@
-IN: scratchpad
-USING: alien kernel parser compiler words sequences ;
+USING: alien ;
 
 "cairo" "libcairo" add-simple-library
 
 PROVIDE: cairo { "/contrib/cairo/cairo.factor" } ;
-
-{ "cairo" } compile-vocabs

contrib/concurrency/load.factor

@@ -1,5 +1,3 @@
-USING: modules ;
-
 REQUIRE: dlists ;
 
 PROVIDE: concurrency

contrib/crypto/load.factor

@@ -1,6 +1,3 @@
-IN: scratchpad
-USING: kernel parser sequences words compiler ;
-
 REQUIRE: math ;
 
 PROVIDE: crypto {

contrib/embedded.factor

@@ -69,3 +69,5 @@ USING: sequences kernel parser math namespaces io ;
     <file-writer> [
 	run-embedded-file
     ] with-stream ;
+
+PROVIDE: embedded ;

contrib/factory/load.factor

@@ -1,5 +1,3 @@
-USING: modules ;
-
 REQUIRE: process concurrency x11 ;
 
 PROVIDE: factory { "factory.factor" } ;

contrib/gap-buffer/load.factor

@@ -1,5 +1,3 @@
-USING: kernel sequences parser words compiler ;
-
 PROVIDE: gap-buffer
 { "circular.factor" "gap-buffer.factor" }
 { "circular-tests.factor" "gap-buffer-tests.factor" } ;

contrib/httpd/load.factor

@@ -1,5 +1,4 @@
-IN: scratchpad
-USING: words kernel parser sequences io compiler ;
+USING: io ;
 
 PROVIDE: httpd { 
     "mime.factor"

contrib/math/load.factor

@@ -1,6 +1,3 @@
-IN: scratchpad
-USING: modules ;
-
 PROVIDE: math { 
     "utils.factor"
     "combinatorics.factor"

contrib/postgresql/load.factor

@@ -1,4 +1,4 @@
-USING: alien modules ;
+USING: alien ;
 
 "postgresql" "libpq" add-simple-library
 

contrib/vim/load.factor

@@ -3,8 +3,9 @@
 #! "contrib/httpd/embedded.factor" run-file
 #! "contrib/vim/load.factor" run-file
 
+REQUIRE: embedded ;
+
 USING: embedded io ;
 
 "contrib/vim" cd
 "factor.vim.fgen" "factor.vim" embedded-convert
-