diff --git a/pkgs/contract-profile/info.rkt b/pkgs/contract-profile/info.rkt
index ca99ede289..79d6ae2672 100644
--- a/pkgs/contract-profile/info.rkt
+++ b/pkgs/contract-profile/info.rkt
@@ -7,7 +7,7 @@
 (define build-deps '("racket-doc"
                      "scribble-lib"
                      "rackunit-lib"
-                     "math"))
+                     "math-lib"))
 
 (define pkg-desc "Profiling tool for contracts")
 
diff --git a/pkgs/db-pkgs/db/info.rkt b/pkgs/db-pkgs/db/info.rkt
index 3c2273e5d9..8cde325ca1 100644
--- a/pkgs/db-pkgs/db/info.rkt
+++ b/pkgs/db-pkgs/db/info.rkt
@@ -2,6 +2,8 @@
 
 (define deps
   '("base" "db-lib" "db-doc"))
+(define implies
+  '("db-lib" "db-doc"))
 
 (define pkg-desc "Database connectivity")
 
diff --git a/pkgs/distro-build/info.rkt b/pkgs/distro-build/info.rkt
index aa2c10c7ef..6fd6e8ba20 100644
--- a/pkgs/distro-build/info.rkt
+++ b/pkgs/distro-build/info.rkt
@@ -3,10 +3,9 @@
 (define collection "distro-build")
 
 (define deps '("base"
-               "at-exp-lib"
                "web-server-lib"
-               "scribble-lib"
                "ds-store-lib"))
+(define build-deps '("at-exp-lib"))
 
 (define pkg-desc "Tools for constructing a distribution of Racket")
 
diff --git a/pkgs/drracket-pkgs/drracket/info.rkt b/pkgs/drracket-pkgs/drracket/info.rkt
index d59eb774a9..7e4318aa85 100644
--- a/pkgs/drracket-pkgs/drracket/info.rkt
+++ b/pkgs/drracket-pkgs/drracket/info.rkt
@@ -34,7 +34,7 @@
                "net-lib"
                "srfi-lib"
                "srfi-doc"
-               "unstable"
+               "unstable-lib"
                "drracket-plugin-lib"
                "gui-pkg-manager-lib"))
 (define build-deps '("mzscheme-doc"
diff --git a/pkgs/games/info.rkt b/pkgs/games/info.rkt
index 18801246f3..fa9c0c2607 100644
--- a/pkgs/games/info.rkt
+++ b/pkgs/games/info.rkt
@@ -11,8 +11,8 @@
                "drracket"
                "gui-lib"
 	       "net-lib"
-               "htdp"
-               "math"
+               "htdp-lib"
+               "math-lib"
                "scribble-lib"
                "sgl"
                "srfi-lib"
@@ -21,7 +21,8 @@
                      "gui-doc"
                      "racket-doc"
                      "pict-lib"
-                     "rackunit-lib"))
+                     "rackunit-lib"
+                     "htdp-doc"))
 
 (define pkg-desc "Games")
 
diff --git a/pkgs/gui-pkgs/gui-lib/info.rkt b/pkgs/gui-pkgs/gui-lib/info.rkt
index b7389c14b4..04ec02a9c1 100644
--- a/pkgs/gui-pkgs/gui-lib/info.rkt
+++ b/pkgs/gui-pkgs/gui-lib/info.rkt
@@ -5,7 +5,6 @@
 (define deps '("srfi-lite-lib"
                "data-lib"
                "base"
-               "rackunit-lib"
                "syntax-color-lib"
                "draw-lib"
                "snip-lib"
@@ -22,7 +21,8 @@
                ("gui-ppc-macosx" #:platform "ppc-macosx")
                ("gui-win32-i386" #:platform "win32\\i386")
                ("gui-win32-x86_64" #:platform "win32\\x86_64")))
-(define build-deps '("at-exp-lib"))
+(define build-deps '("at-exp-lib"
+                     "rackunit-lib"))
 
 (define pkg-desc "implementation (no documentation) part of \"gui\"")
 
diff --git a/pkgs/gui-pkgs/gui-test/info.rkt b/pkgs/gui-pkgs/gui-test/info.rkt
index 8877fb1ecb..e20fb4dd3a 100644
--- a/pkgs/gui-pkgs/gui-test/info.rkt
+++ b/pkgs/gui-pkgs/gui-test/info.rkt
@@ -2,19 +2,18 @@
 
 (define collection 'multi)
 
-(define deps '("base"
-               "gui-lib"
-               "rackunit-lib"
-               "scribble-lib"
-               "pconvert-lib"
-               "compatibility-lib"))
+(define deps '("base"))
 (define build-deps '("scheme-lib"
                      "draw-lib"
                      "racket-test"
                      "sgl"
                      "snip-lib"
                      "wxme-lib"
-                     ))
+                     "gui-lib"
+                     "rackunit-lib"
+                     "scribble-lib"
+                     "pconvert-lib"
+                     "compatibility-lib"))
 
 (define pkg-desc "tests for \"gui\"")
 
diff --git a/pkgs/htdp-pkgs/htdp-lib/info.rkt b/pkgs/htdp-pkgs/htdp-lib/info.rkt
index 89c2ea5c79..9f40178271 100644
--- a/pkgs/htdp-pkgs/htdp-lib/info.rkt
+++ b/pkgs/htdp-pkgs/htdp-lib/info.rkt
@@ -12,7 +12,8 @@
     "gui-lib"
     "htdp-doc"
     "html-lib"
-    "images"
+    "images-lib"
+    "images-gui-lib"
     "pconvert-lib"
     "r5rs-lib"
     "sandbox-lib"
diff --git a/pkgs/images-pkgs/images-doc/info.rkt b/pkgs/images-pkgs/images-doc/info.rkt
index e002747dff..1b492ccc8a 100644
--- a/pkgs/images-pkgs/images-doc/info.rkt
+++ b/pkgs/images-pkgs/images-doc/info.rkt
@@ -2,9 +2,9 @@
 
 (define collection 'multi)
 
-(define deps '("base"
-               "images-lib"))
-(define build-deps '("draw-doc"
+(define deps '("base"))
+(define build-deps '("images-lib"
+                     "draw-doc"
                      "gui-doc"
                      "pict-doc"
                      "slideshow-doc"
diff --git a/pkgs/lazy/info.rkt b/pkgs/lazy/info.rkt
index da148ebb46..54303c6de6 100644
--- a/pkgs/lazy/info.rkt
+++ b/pkgs/lazy/info.rkt
@@ -21,7 +21,7 @@
 (define drracket-tool-names '("Lazy Racket"))
 (define deps '("base"
                "drracket-plugin-lib"
-               "htdp"
+               "htdp-lib"
                "string-constants-lib"
                "compatibility-lib"))
 (define build-deps '("mzscheme-doc"
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/info.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/info.rkt
index a0c1c6df56..93010926f8 100644
--- a/pkgs/macro-debugger-pkgs/macro-debugger/info.rkt
+++ b/pkgs/macro-debugger-pkgs/macro-debugger/info.rkt
@@ -6,14 +6,16 @@
                "compatibility-lib"
                "data-lib"
                "gui-lib"
-               "images"
+               "images-lib"
+               "images-gui-lib"
                "parser-tools-lib"
+               "unstable-lib"
                "unstable-list-lib"
-               "macro-debugger-text-lib"
-               "unstable"))
+               "macro-debugger-text-lib"))
 (define build-deps '("rackunit-lib"
                      "scribble-lib"
-                     "racket-doc"))
+                     "racket-doc"
+                     "unstable-doc"))
 
 (define pkg-desc "The macro debugger tool")
 
diff --git a/pkgs/picturing-programs/info.rkt b/pkgs/picturing-programs/info.rkt
index 32ec6f3aff..4b908d8230 100644
--- a/pkgs/picturing-programs/info.rkt
+++ b/pkgs/picturing-programs/info.rkt
@@ -6,8 +6,9 @@
                "draw-lib"
                "gui-lib"
                "snip-lib"
-               "htdp"))
+               "htdp-lib"))
 (define build-deps '("racket-doc"
+                     "htdp-doc"
                      "scribble-lib"))
 
 (define pkg-desc "Teaching libraries for _Picturing Programs_")
diff --git a/pkgs/racket-pkgs/racket-test/info.rkt b/pkgs/racket-pkgs/racket-test/info.rkt
index 428652cc6d..ca3dfb1d34 100644
--- a/pkgs/racket-pkgs/racket-test/info.rkt
+++ b/pkgs/racket-pkgs/racket-test/info.rkt
@@ -7,10 +7,9 @@
                "sandbox-lib"
                "compatibility-lib"
                "planet-lib"
+               "net-lib"
                "distributed-places-lib"
                "eli-tester"
-               ;; for `net` tests
-               "net-lib"
                ;; for `pkg` tests
                "web-server-lib"
                "rackunit-lib"
@@ -21,7 +20,6 @@
                "scribble-lib"
                "syntax-color-lib"
                "typed-racket-lib"
-               "serialize-cstruct-lib"
 
                "cext-lib"
 
diff --git a/pkgs/realm/info.rkt b/pkgs/realm/info.rkt
index 61b7a98d29..5ec329c6e0 100644
--- a/pkgs/realm/info.rkt
+++ b/pkgs/realm/info.rkt
@@ -17,7 +17,7 @@
 
 ; (define scribblings '(("htdp.scrbl")))
 (define deps '("base"
-               "htdp"))
+               "htdp-lib"))
 (define build-deps '("rackunit-lib"))
 
 (define pkg-desc "Sample code for _Realm of Racket_")
diff --git a/pkgs/redex-pkgs/redex-examples/info.rkt b/pkgs/redex-pkgs/redex-examples/info.rkt
index 85073007ff..ff15e1ab4c 100644
--- a/pkgs/redex-pkgs/redex-examples/info.rkt
+++ b/pkgs/redex-pkgs/redex-examples/info.rkt
@@ -7,8 +7,7 @@
                "rackunit-lib"
                "redex-lib"
                "slideshow-lib"))
-(define build-deps '("at-exp-lib"
-                     "scribble-lib"))
+(define build-deps '())
 
 (define pkg-desc "PLT Redex examples")
 
diff --git a/pkgs/scribble-pkgs/scribble-lib/info.rkt b/pkgs/scribble-pkgs/scribble-lib/info.rkt
index 45be4bddca..27de3c8d97 100644
--- a/pkgs/scribble-pkgs/scribble-lib/info.rkt
+++ b/pkgs/scribble-pkgs/scribble-lib/info.rkt
@@ -6,13 +6,13 @@
                "base"
                "compatibility-lib"
                "scribble-text-lib"
-               "planet-lib"
+               "planet-lib" ; used dynamically
 	       "net-lib"
                "at-exp-lib"
                "draw-lib" 
                "syntax-color-lib"
-               "sandbox-lib"
-               "rackunit-lib"))
+               "sandbox-lib"))
+(define build-deps '("rackunit-lib"))
 
 (define pkg-desc "implementation (no documentation) part of \"scribble\"")
 
diff --git a/pkgs/srfi-pkgs/srfi-lib/info.rkt b/pkgs/srfi-pkgs/srfi-lib/info.rkt
index dd5c08e0f9..cf45c552c8 100644
--- a/pkgs/srfi-pkgs/srfi-lib/info.rkt
+++ b/pkgs/srfi-pkgs/srfi-lib/info.rkt
@@ -5,7 +5,6 @@
 (define deps '("scheme-lib"
                "base"
                "srfi-lite-lib"
-               "r5rs-lib"
                "r6rs-lib"
                "compatibility-lib"))
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/info.rkt
index 3e64e49a27..5dbe4aab4d 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/info.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/info.rkt
@@ -8,7 +8,6 @@
                "pconvert-lib"
                "unstable-contract-lib"
                "unstable-list-lib"
-               "unstable-debug-lib"
                "compatibility-lib" ;; to assign types
                "string-constants-lib"))
 
diff --git a/pkgs/unstable-pkgs/unstable-lib/info.rkt b/pkgs/unstable-pkgs/unstable-lib/info.rkt
index 58565e83fc..a723153bee 100644
--- a/pkgs/unstable-pkgs/unstable-lib/info.rkt
+++ b/pkgs/unstable-pkgs/unstable-lib/info.rkt
@@ -9,7 +9,7 @@
                "scribble-lib"
                "slideshow-lib"
                "unstable-macro-testing-lib"))
-(define imples '("unstable-macro-testing-lib"))
+(define implies '("unstable-macro-testing-lib"))
 (define build-deps '())
 
 (define pkg-desc "implementation (no documentation) part of \"unstable\"")
diff --git a/pkgs/web-server-pkgs/web-server-doc/info.rkt b/pkgs/web-server-pkgs/web-server-doc/info.rkt
index 3acdd9ae5e..78f191997b 100644
--- a/pkgs/web-server-pkgs/web-server-doc/info.rkt
+++ b/pkgs/web-server-pkgs/web-server-doc/info.rkt
@@ -7,7 +7,7 @@
                      "compatibility-doc"
                      "db-doc"
                      "scribble-doc"
-                     "unstable"
+                     "unstable-doc"
                      "compatibility-lib"
                      "db-lib"
 		     "net-lib"