diff --git a/collects/scribble/base-render.ss b/collects/scribble/base-render.ss
index 1b29a0bc76..a5d33c182a 100644
--- a/collects/scribble/base-render.ss
+++ b/collects/scribble/base-render.ss
@@ -292,7 +292,8 @@
 
       (define/public (render ds fns ri)
         (map (lambda (d fn)
-               (printf " [Output to ~a]\n" fn)
+               (when #f
+                 (printf " [Output to ~a]\n" fn))
                (with-output-to-file fn
                  #:exists 'truncate/replace
                  (lambda ()
diff --git a/collects/scribble/manual-struct.ss b/collects/scribble/manual-struct.ss
index 6722bafdc1..eea0b8a858 100644
--- a/collects/scribble/manual-struct.ss
+++ b/collects/scribble/manual-struct.ss
@@ -6,7 +6,8 @@
 (provide-structs
  [exported-index-desc ([name symbol?]
                         [from-libs (listof module-path?)])]
- [(method-index-desc exported-index-desc) ([method-name symbol?])]
+ [(method-index-desc exported-index-desc) ([method-name symbol?]
+                                           [class-tag tag?])]
  [(procedure-index-desc exported-index-desc) ()]
  [(thing-index-desc exported-index-desc) ()]
  [(struct-index-desc exported-index-desc) ()]
diff --git a/collects/scribble/manual.ss b/collects/scribble/manual.ss
index 35d480bd85..fb29cedbf9 100644
--- a/collects/scribble/manual.ss
+++ b/collects/scribble/manual.ss
@@ -713,7 +713,9 @@
                                                                                                      (make-method-index-desc 
                                                                                                       (syntax-e within-id)
                                                                                                       libs
-                                                                                                      mname)))))
+                                                                                                      mname
+                                                                                                      (register-scheme-definition 
+                                                                                                       within-id #t))))))
                                                                         tag)
                                                                        (car content)))
                                                                  (*method (car prototype) within-id))))]
diff --git a/collects/scribblings/gui/gui.scrbl b/collects/scribblings/gui/gui.scrbl
index 6cf4e1a495..3b6ea4163b 100644
--- a/collects/scribblings/gui/gui.scrbl
+++ b/collects/scribblings/gui/gui.scrbl
@@ -4,7 +4,7 @@
 @title[#:tag-prefix '(lib "scribblings/gui/gui.scrbl") 
        #:tag "top"]{PLT Scheme GUI: MrEd}
 
-@declare-exporting[(lib "mred")]
+@declare-exporting[mred scheme/gui]
 
 This reference manual describes the MrEd GUI toolbox that is part of
  PLT Scheme. See @secref[#:doc '(lib "scribblings/guide/guide.scrbl")
diff --git a/collects/scribblings/reference/breaks.scrbl b/collects/scribblings/reference/breaks.scrbl
index df4f440851..2874dcfb5b 100644
--- a/collects/scribblings/reference/breaks.scrbl
+++ b/collects/scribblings/reference/breaks.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "breakhandler"]{Breaks}
 
-@declare-exporting[(lib "scheme/break")]
-
 @section-index["threads" "breaking"]
 
 A @deftech{break} is an asynchronous exception, usually triggered
diff --git a/collects/scribblings/reference/bytes.scrbl b/collects/scribblings/reference/bytes.scrbl
index 9d38270de4..f551ace535 100644
--- a/collects/scribblings/reference/bytes.scrbl
+++ b/collects/scribblings/reference/bytes.scrbl
@@ -198,8 +198,6 @@ string.
 @; ----------------------------------------
 @section{Bytes to/from Characters, Decoding and Encoding}
 
-@declare-exporting[(lib "scheme/bytes")]
-
 @defproc[(bytes->string/utf-8 [bstr bytes?]
                               [err-char (or/c false/c char?) #f]
                               [start exact-nonnegative-integer? 0]
@@ -334,8 +332,6 @@ string.
 @; ----------------------------------------
 @section{Bytes to Bytes Encoding Conversion}
 
-@declare-exporting[(lib "scheme/bytes/converter")]
-
 @defproc[(bytes-open-converter [from-name string?][to-name string?])
          bytes-converter?]{
 
diff --git a/collects/scribblings/reference/chars.scrbl b/collects/scribblings/reference/chars.scrbl
index 931cf063b5..bc2931e24a 100644
--- a/collects/scribblings/reference/chars.scrbl
+++ b/collects/scribblings/reference/chars.scrbl
@@ -137,8 +137,6 @@ otherwise.
 @; ----------------------------------------
 @section{Classifications}
 
-@declare-exporting[(lib "scheme/char")]
-
 @defproc[(char-alphabetic? [char char?]) boolean?]{
 
 Returns @scheme[#t] if @scheme[char]'s Unicode general category is
@@ -241,8 +239,6 @@ Unicode.}
 @; ----------------------------------------
 @section{Character Conversions}
 
-@declare-exporting[(lib "scheme/char")]
-
 @defproc[(char-upcase [char char?]) char?]{
 
 Produces a character consistent with the 1-to-1 code point mapping
diff --git a/collects/scribblings/reference/class.scrbl b/collects/scribblings/reference/class.scrbl
index 9957a02be5..5b3fb44495 100644
--- a/collects/scribblings/reference/class.scrbl
+++ b/collects/scribblings/reference/class.scrbl
@@ -71,7 +71,7 @@
 
 @title[#:tag "mzlib:class" #:style 'toc]{Classes and Objects}
 
-@declare-exporting[scheme/class]
+@declare-exporting[scheme/class scheme]
 
 @local-table-of-contents[]
 
diff --git a/collects/scribblings/reference/code-inspectors.scrbl b/collects/scribblings/reference/code-inspectors.scrbl
index 94e8ed90e6..57e3d7dd73 100644
--- a/collects/scribblings/reference/code-inspectors.scrbl
+++ b/collects/scribblings/reference/code-inspectors.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "modprotect"]{Code Inspectors}
 
-@declare-exporting[(lib "scheme/inspector")]
-
 In the same way that inspectors control access to structure fields
 (see @secref["inspectors"]), inspectors also control access to
 @tech{module bindings}. The default inspector for @tech{module
diff --git a/collects/scribblings/reference/cont-marks.scrbl b/collects/scribblings/reference/cont-marks.scrbl
index 8e98400ea8..124261472b 100644
--- a/collects/scribblings/reference/cont-marks.scrbl
+++ b/collects/scribblings/reference/cont-marks.scrbl
@@ -7,8 +7,6 @@
 
 @title[#:tag "contmarks"]{Continuation Marks}
 
-@declare-exporting[(lib "scheme/control")]
-
 See @secref["mark-model"] and @secref["prompt-model"] for
 general information about continuation marks.
 
diff --git a/collects/scribblings/reference/cont.scrbl b/collects/scribblings/reference/cont.scrbl
index 4ed81e225a..546d94b891 100644
--- a/collects/scribblings/reference/cont.scrbl
+++ b/collects/scribblings/reference/cont.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "cont"]{Continuations}
 
-@declare-exporting[(lib "scheme/control")]
-
 See @secref["cont-model"] and @secref["prompt-model"] for
 general information about continuations. PLT Scheme's support for
 prompts and composable continuations most closely resembles Dorai
diff --git a/collects/scribblings/reference/contracts.scrbl b/collects/scribblings/reference/contracts.scrbl
index 7cca5c73e4..429d335b54 100644
--- a/collects/scribblings/reference/contracts.scrbl
+++ b/collects/scribblings/reference/contracts.scrbl
@@ -3,7 +3,7 @@
 
 @title[#:tag "mzlib:contract" #:style 'toc]{Contracts}
 
-@declare-exporting[scheme/contract]
+@declare-exporting[scheme/contract scheme]
 
 A @defterm{contract} controls the flow of values to ensure that the
 expectations of one party are met by another party.  The
diff --git a/collects/scribblings/reference/custodians.scrbl b/collects/scribblings/reference/custodians.scrbl
index 853a2e6019..f428189474 100644
--- a/collects/scribblings/reference/custodians.scrbl
+++ b/collects/scribblings/reference/custodians.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "custodians"]{Custodians}
 
-@declare-exporting[(lib "scheme/custodian")]
-
 See @secref["custodian-model"] for basic information on the PLT
 Scheme custodian model.
 
diff --git a/collects/scribblings/reference/custom-write.scrbl b/collects/scribblings/reference/custom-write.scrbl
index 4a2f5d7d4a..388279ea15 100644
--- a/collects/scribblings/reference/custom-write.scrbl
+++ b/collects/scribblings/reference/custom-write.scrbl
@@ -3,8 +3,6 @@
 
 @title{Printer Extension}
 
-@declare-exporting[(lib "scheme/write")]
-
 @defthing[prop:custom-write struct-type-property?]{
 
 Associates a procedure to a structure type to used by the default
diff --git a/collects/scribblings/reference/data.scrbl b/collects/scribblings/reference/data.scrbl
index 3397bab7f8..f425104fd5 100644
--- a/collects/scribblings/reference/data.scrbl
+++ b/collects/scribblings/reference/data.scrbl
@@ -325,8 +325,6 @@ Sets the content of @scheme[box] to @scheme[v].}
 @; ----------------------------------------------------------------------
 @section[#:tag "hashtables"]{Hash Tables}
 
-@declare-exporting[(lib "scheme/hash-table")]
-
 A hash table can be used as a two-valued sequence (see
 @secref["sequences"]). The keys and values of the hash table serve
 as elements of the sequence (i.e., each element is a key and its
diff --git a/collects/scribblings/reference/define-struct.scrbl b/collects/scribblings/reference/define-struct.scrbl
index f287fdd04e..deaa037155 100644
--- a/collects/scribblings/reference/define-struct.scrbl
+++ b/collects/scribblings/reference/define-struct.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "define-struct"]{Defining Structure Types: @scheme[define-struct]}
 
-@declare-exporting[(lib "scheme/define-struct")]
-
 @guideintro["define-struct"]{@scheme[define-struct]}
 
 @defform/subs[(define-struct id-maybe-super (field ...)
diff --git a/collects/scribblings/reference/encodings.scrbl b/collects/scribblings/reference/encodings.scrbl
index 4c1af3530d..492ebdea6d 100644
--- a/collects/scribblings/reference/encodings.scrbl
+++ b/collects/scribblings/reference/encodings.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "encodings"]{Encodings and Locales}
 
-@declare-exporting[(lib "scheme/locale")]
-
 When a port is provided to a character-based operation, such as
 @scheme[read-char] or @scheme[read], the port's bytes are read and
 interpreted as a UTF-8 encoding of characters. Thus, reading a single
diff --git a/collects/scribblings/reference/eval.scrbl b/collects/scribblings/reference/eval.scrbl
index 33e7352c62..4df4bf658a 100644
--- a/collects/scribblings/reference/eval.scrbl
+++ b/collects/scribblings/reference/eval.scrbl
@@ -3,8 +3,6 @@
 
 @title{Evaluation and Compilation}
 
-@declare-exporting[(lib "scheme/eval")]
-
 @defparam[current-eval proc (any/c . -> . any)]{
 
 A parameter that determines the current @deftech{evaluation handler}.
diff --git a/collects/scribblings/reference/exit.scrbl b/collects/scribblings/reference/exit.scrbl
index bcd59f251a..ebb85e094b 100644
--- a/collects/scribblings/reference/exit.scrbl
+++ b/collects/scribblings/reference/exit.scrbl
@@ -3,8 +3,6 @@
 
 @title{Exiting}
 
-@declare-exporting[(lib "scheme/exit")]
-
 @defproc[(exit [v any/c #t]) any]{
 
 Passes @scheme[v] to the current @tech{exit handler}. If the exit
diff --git a/collects/scribblings/reference/exns.scrbl b/collects/scribblings/reference/exns.scrbl
index c5a77d55b2..fbfc2f3a35 100644
--- a/collects/scribblings/reference/exns.scrbl
+++ b/collects/scribblings/reference/exns.scrbl
@@ -4,8 +4,6 @@
 
 @title[#:tag "exns"]{Exceptions}
 
-@declare-exporting[(lib "scheme/exn")]
-
 See @secref["exn-model"] for information on the PLT Scheme
 exception model. It is based on @cite[#:key "friedman-exns" #:title
 "Exception system proposal" #:author "Daniel P. Friedman and
diff --git a/collects/scribblings/reference/file-ports.scrbl b/collects/scribblings/reference/file-ports.scrbl
index 0cdf7fed80..1642d220cc 100644
--- a/collects/scribblings/reference/file-ports.scrbl
+++ b/collects/scribblings/reference/file-ports.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "file-ports"]{File Ports}
 
-@declare-exporting[(lib "scheme/port/file")]
-
 A port created by @scheme[open-input-file], @scheme[open-output-file],
 @scheme[subprocess], and related functions is a @deftech{file-stream
 port}.  The initial input, output, and error ports in stand-alone
diff --git a/collects/scribblings/reference/filesystem.scrbl b/collects/scribblings/reference/filesystem.scrbl
index b69962966d..9983f8926e 100644
--- a/collects/scribblings/reference/filesystem.scrbl
+++ b/collects/scribblings/reference/filesystem.scrbl
@@ -3,8 +3,6 @@
 
 @title{Filesystem}
 
-@declare-exporting[(lib "scheme/file")]
-
 @;------------------------------------------------------------------------
 @section[#:tag "findpaths"]{Locating Paths}
 
diff --git a/collects/scribblings/reference/macros.scrbl b/collects/scribblings/reference/macros.scrbl
index d832e1e0b8..ca622bcd5d 100644
--- a/collects/scribblings/reference/macros.scrbl
+++ b/collects/scribblings/reference/macros.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:style 'toc]{Macros}
 
-@declare-exporting[(lib "scheme/syntax")]
-
 See @secref["syntax-model"] for general information on how programs
 are parsed. In particular, the subsection @secref["expand-steps"]
 describes how parsing triggers macros, and
diff --git a/collects/scribblings/reference/memory.scrbl b/collects/scribblings/reference/memory.scrbl
index 2bf368e937..3cc8208271 100644
--- a/collects/scribblings/reference/memory.scrbl
+++ b/collects/scribblings/reference/memory.scrbl
@@ -5,8 +5,6 @@
 
 @local-table-of-contents[]
 
-@declare-exporting[(lib "scheme/memory")]
-
 @section[#:tag "weakbox"]{Weak Boxes}
 
 A @deftech{weak box} is similar to a normal box (see
diff --git a/collects/scribblings/reference/module-reflect.scrbl b/collects/scribblings/reference/module-reflect.scrbl
index 3f96f577e3..87b749095c 100644
--- a/collects/scribblings/reference/module-reflect.scrbl
+++ b/collects/scribblings/reference/module-reflect.scrbl
@@ -3,8 +3,6 @@
 
 @title{Module Names and Loading}
 
-@declare-exporting[(lib "scheme/module-name")]
-
 @;------------------------------------------------------------------------
 @section[#:tag "modnameresolver"]{Resolving Module Names}
 
diff --git a/collects/scribblings/reference/namespaces.scrbl b/collects/scribblings/reference/namespaces.scrbl
index 7ac43f64a7..f2c136ee6a 100644
--- a/collects/scribblings/reference/namespaces.scrbl
+++ b/collects/scribblings/reference/namespaces.scrbl
@@ -3,8 +3,6 @@
 
 @title{Namespaces}
 
-@declare-exporting[(lib "scheme/namespace")]
-
 See @secref["namespace-model"] for basic information on the
 namespace model.
 
diff --git a/collects/scribblings/reference/networking.scrbl b/collects/scribblings/reference/networking.scrbl
index 53bc733cc5..d2fbe695a0 100644
--- a/collects/scribblings/reference/networking.scrbl
+++ b/collects/scribblings/reference/networking.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "networking" #:style 'toc]{Networking}
 
-@declare-exporting[(lib "scheme/network")]
-
 @local-table-of-contents[]
 
 @;------------------------------------------------------------------------
diff --git a/collects/scribblings/reference/numbers.scrbl b/collects/scribblings/reference/numbers.scrbl
index e064966f0d..2731ebbec0 100644
--- a/collects/scribblings/reference/numbers.scrbl
+++ b/collects/scribblings/reference/numbers.scrbl
@@ -555,8 +555,6 @@ Returns @scheme[(and (exact-integer? v) (positive? v))].
 @; ------------------------------------------------------------------------
 @section{Random Numbers}
 
-@declare-exporting[(lib "scheme/random")]
-
 @defproc*[([(random [k (and/c positive-exact-integer?
                               (integer-in 1 (sub1 (expt 2 31))))])
             nonnegative-exact-integer?]
@@ -626,8 +624,6 @@ one of the last three integers must be non-zero.}
 @; ------------------------------------------------------------------------
 @section{Number--String Conversions}
 
-@declare-exporting[(lib "scheme/number")]
-
 @section-index["numbers" "machine representations"]
 @section-index["numbers" "floating-point"]
 @section-index["numbers" "big-endian"]
diff --git a/collects/scribblings/reference/pairs-scrbl.scrbl b/collects/scribblings/reference/pairs-scrbl.scrbl
index 8dd58aa8ee..668a68bc8a 100644
--- a/collects/scribblings/reference/pairs-scrbl.scrbl
+++ b/collects/scribblings/reference/pairs-scrbl.scrbl
@@ -137,8 +137,6 @@ Changes the mutable pair @scheme[p] so that its second element is
 @; ----------------------------------------
 @section{List Operations}
 
-@declare-exporting[(lib "scheme/list")]
-
 @defproc[(length [lst list?])
          nonnegative-exact-integer?]{
 
@@ -181,8 +179,6 @@ reverse order.}
 @; ----------------------------------------
 @section{List Iteration}
 
-@declare-exporting[(lib "scheme/list")]
-
 @defproc[(map [proc procedure?] [lst list?] ...+) 
          list?]{
 
diff --git a/collects/scribblings/reference/parameters.scrbl b/collects/scribblings/reference/parameters.scrbl
index e5cb12264d..b4a13ba9ef 100644
--- a/collects/scribblings/reference/parameters.scrbl
+++ b/collects/scribblings/reference/parameters.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "parameters"]{Parameters}
 
-@declare-exporting[(lib "scheme/parameter")]
-
 See @secref["parameter-model"] for basic information on the
 parameter model. Parameters correspond to @defterm{preserved thread
 fluids} in Scsh @cite[#:key "cite:thread-fluids" #:title "Processes
diff --git a/collects/scribblings/reference/paths.scrbl b/collects/scribblings/reference/paths.scrbl
index f976a7f13c..5c0732ed06 100644
--- a/collects/scribblings/reference/paths.scrbl
+++ b/collects/scribblings/reference/paths.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "pathutils" #:style 'toc]{Paths}
 
-@declare-exporting[(lib "scheme/path")]
-
 When a Scheme procedure takes a filesystem path as an argument, the
 path can be provided either as a string or as an instance of the
 @deftech{path} datatype. If a string is provided, it is converted to a
diff --git a/collects/scribblings/reference/pipes.scrbl b/collects/scribblings/reference/pipes.scrbl
index 616dd04c0f..4d8414f2d4 100644
--- a/collects/scribblings/reference/pipes.scrbl
+++ b/collects/scribblings/reference/pipes.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "pipeports"]{Pipes}
 
-@declare-exporting[(lib "scheme/port/pipe")]
-
 A Scheme @deftech{pipe} is internal to Scheme, and not related to
 OS-level pipes (which are @tech{file-stream ports}) for communicating
 between different processes.
diff --git a/collects/scribblings/reference/port-buffers.scrbl b/collects/scribblings/reference/port-buffers.scrbl
index 7887d6b64a..c31ecdaa50 100644
--- a/collects/scribblings/reference/port-buffers.scrbl
+++ b/collects/scribblings/reference/port-buffers.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "port-buffers"]{Port Buffers and Positions}
 
-@declare-exporting[(lib "scheme/port")]
-
 Some ports---especially those that read from and write to files---are
 internally buffered:
 
diff --git a/collects/scribblings/reference/port-line-counting.scrbl b/collects/scribblings/reference/port-line-counting.scrbl
index 5c339b663e..9fa7546aca 100644
--- a/collects/scribblings/reference/port-line-counting.scrbl
+++ b/collects/scribblings/reference/port-line-counting.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "linecol"]{Counting Positions, Lines, and Columns}
 
-@declare-exporting[(lib "scheme/port")]
-
 @section-index["line numbers"]
 @section-index["column numbers"]
 @section-index["port positions"]
diff --git a/collects/scribblings/reference/port-procs.scrbl b/collects/scribblings/reference/port-procs.scrbl
index 759f96e30d..468dbdc81e 100644
--- a/collects/scribblings/reference/port-procs.scrbl
+++ b/collects/scribblings/reference/port-procs.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "port-ops"]{Managing Ports}
 
-@declare-exporting[(lib "scheme/port")]
-
 @defproc[(input-port? [v any/c]) boolean?]{
 Returns @scheme[#t] if @scheme[v] is an input port, @scheme[#f] otherwise.}
 
diff --git a/collects/scribblings/reference/procedures.scrbl b/collects/scribblings/reference/procedures.scrbl
index ab93c6364f..07ddbe109d 100644
--- a/collects/scribblings/reference/procedures.scrbl
+++ b/collects/scribblings/reference/procedures.scrbl
@@ -27,8 +27,6 @@ is called in tail position with respect to the @scheme[apply] call.
 @; ----------------------------------------
 @section{Keywords and Arity}
 
-@declare-exporting[(lib "scheme/procedure")]
-
 @defproc[(keyword-apply [proc procedure?]
                         [kw-lst (listof keyword?)]
                         [kw-val-lst list?]
@@ -58,12 +56,12 @@ and @scheme[lst]; otherwise, the @exnraise[exn:fail:contract].
 ]}
 
 @defproc[(procedure-arity [proc procedure?])
-         arity?]{
+         procedure-arity?]{
 
 Returns information about the number of by-position arguments accepted
-by @scheme[proc]. See also @scheme[arity?].}
+by @scheme[proc]. See also @scheme[procedure-arity?].}
 
-@defproc[(arity? [v any/c]) boolean?]{
+@defproc[(procedure-arity? [v any/c]) boolean?]{
 
 A valid arity is one of the following:
 
@@ -103,7 +101,7 @@ when no keyword arguments are supplied, @scheme[#f] otherwise.
 ]}
 
 @defproc[(procedure-reduce-arity [proc procedure?]
-                                 [arity arity?])
+                                 [arity procedure-arity?])
          procedure?]{
 
 Returns a procedure that is the same as @scheme[proc] (including
@@ -167,7 +165,7 @@ obtains its result frmo @scheme[plain-proc].
 @defstruct[arity-at-least ([value nonnegative-exact-integer?])]{
 
 This structure type is used for the result of @scheme[procedure-arity].
-See also @scheme[arity?].}
+See also @scheme[procedure-arity?].}
 
 
 @defthing[prop:procedure struct-type-property?]{
diff --git a/collects/scribblings/reference/prop-port.scrbl b/collects/scribblings/reference/prop-port.scrbl
index 196716ed8e..85c5a31b18 100644
--- a/collects/scribblings/reference/prop-port.scrbl
+++ b/collects/scribblings/reference/prop-port.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "portstructs"]{Structures as Ports}
 
-@declare-exporting[(lib "scheme/port")]
-
 @defthing[prop:input-port struct-type-property?]
 @defthing[prop:output-port struct-type-property?]
 
diff --git a/collects/scribblings/reference/read.scrbl b/collects/scribblings/reference/read.scrbl
index ad33c62d98..6dbca002b6 100644
--- a/collects/scribblings/reference/read.scrbl
+++ b/collects/scribblings/reference/read.scrbl
@@ -3,8 +3,6 @@
 
 @title{Reading}
 
-@declare-exporting[(lib "scheme/read")]
-
 @defproc[(read [in input-port? (current-input-port)]) any]{
 
 Reads and returns a single @tech{datum} from @scheme[in]. If
diff --git a/collects/scribblings/reference/readtables.scrbl b/collects/scribblings/reference/readtables.scrbl
index 3efdf71539..662af3849e 100644
--- a/collects/scribblings/reference/readtables.scrbl
+++ b/collects/scribblings/reference/readtables.scrbl
@@ -4,8 +4,6 @@
 
 @title[#:style 'toc]{Reader Extension}
 
-@declare-exporting[(lib "scheme/readtable")]
-
 Scheme's reader can be extended in three ways: through a reader-macro
 procedure in a readtable (see @secref["readtables"]), through a
 @litchar{#reader} form (see @secref["parse-reader"]), or through a
diff --git a/collects/scribblings/reference/reference.scrbl b/collects/scribblings/reference/reference.scrbl
index 256ed9c601..457596a932 100644
--- a/collects/scribblings/reference/reference.scrbl
+++ b/collects/scribblings/reference/reference.scrbl
@@ -4,7 +4,7 @@
 @title[#:tag-prefix '(lib "scribblings/reference/reference.scrbl")
        #:tag "top"]{PLT Scheme Reference}
 
-@declare-exporting[(lib "scheme/base")]
+@declare-exporting[scheme/base scheme]
 
 This manual defines the core PLT Scheme language and describes its
 most prominent libraries. The companion manual @|Guide| provides a
diff --git a/collects/scribblings/reference/regexps.scrbl b/collects/scribblings/reference/regexps.scrbl
index c96927b2c7..694c988a28 100644
--- a/collects/scribblings/reference/regexps.scrbl
+++ b/collects/scribblings/reference/regexps.scrbl
@@ -6,8 +6,6 @@
 
 @title[#:tag "regexp"]{Regular Expressions}
 
-@declare-exporting[(lib "scheme/regexp")]
-
 @section-index{regexps}
 @section-index{pattern matching}
 @section-index["strings" "pattern matching"]
diff --git a/collects/scribblings/reference/runtime.scrbl b/collects/scribblings/reference/runtime.scrbl
index 3ed6c2106b..4a6ac704c4 100644
--- a/collects/scribblings/reference/runtime.scrbl
+++ b/collects/scribblings/reference/runtime.scrbl
@@ -3,8 +3,6 @@
 
 @title{Environment and Runtime Information}
 
-@declare-exporting[(lib "scheme/runtime")]
-
 @defproc[(getenv [name string?]) (or/c string? false/c)]{
 
 Gets the value of an operating system environment variable. The
diff --git a/collects/scribblings/reference/security-guards.scrbl b/collects/scribblings/reference/security-guards.scrbl
index dbef257f17..0daf229c94 100644
--- a/collects/scribblings/reference/security-guards.scrbl
+++ b/collects/scribblings/reference/security-guards.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "securityguards"]{Security Guards}
 
-@declare-exporting[(lib "scheme/security-guard")]
-
 @defproc[(security-guard? [v any/c]) boolean?]{
 
 Returns @scheme[#t] if @scheme[v] is a security guard value as created
diff --git a/collects/scribblings/reference/sequences.scrbl b/collects/scribblings/reference/sequences.scrbl
index 04c27f3821..46dd71e072 100644
--- a/collects/scribblings/reference/sequences.scrbl
+++ b/collects/scribblings/reference/sequences.scrbl
@@ -11,8 +11,6 @@
 
 @title[#:tag "sequences"]{Sequences}
 
-@declare-exporting[(lib "scheme/sequence")]
-
 @guideintro["sequences"]{sequences}
 
 A @pidefterm{sequence} encapsulates an ordered stream of values. The
diff --git a/collects/scribblings/reference/string-input.scrbl b/collects/scribblings/reference/string-input.scrbl
index 1475d8e357..832aebd0bc 100644
--- a/collects/scribblings/reference/string-input.scrbl
+++ b/collects/scribblings/reference/string-input.scrbl
@@ -3,8 +3,6 @@
 
 @title{Byte and String Input}
 
-@declare-exporting[(lib "scheme/io")]
-
 @defproc[(read-char [in input-port? (current-input-port)]) 
          (or/c character? eof-object?)]{
 
diff --git a/collects/scribblings/reference/string-output.scrbl b/collects/scribblings/reference/string-output.scrbl
index a0b065f055..4c822ed3a6 100644
--- a/collects/scribblings/reference/string-output.scrbl
+++ b/collects/scribblings/reference/string-output.scrbl
@@ -3,8 +3,6 @@
 
 @title{Byte and String Output}
 
-@declare-exporting[(lib "scheme/io")]
-
 @defproc[(write-char [char character?][out output-port? (current-output-port)])
          void?]{
 
diff --git a/collects/scribblings/reference/string-ports.scrbl b/collects/scribblings/reference/string-ports.scrbl
index 1723efe47a..8e42e63073 100644
--- a/collects/scribblings/reference/string-ports.scrbl
+++ b/collects/scribblings/reference/string-ports.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "stringport"]{String Ports}
 
-@declare-exporting[(lib "scheme/port/bytes")]
-
 String input and output ports do not need to be explicitly closed. The
 @scheme[file-position] procedure works for string ports in
 position-setting mode.
diff --git a/collects/scribblings/reference/strings.scrbl b/collects/scribblings/reference/strings.scrbl
index 2dd42efe60..4ab25743a8 100644
--- a/collects/scribblings/reference/strings.scrbl
+++ b/collects/scribblings/reference/strings.scrbl
@@ -259,8 +259,6 @@ _i)] is the character produced by @scheme[(proc _i)].
 @; ----------------------------------------
 @section{String Conversions}
 
-@declare-exporting[(lib "scheme/string")]
-
 @defproc[(string-upcase [str string?]) string?]{ Returns a string
  whose characters are the upcase conversion of the characters in
  @scheme[str]. The conversion uses Unicode's locale-independent
@@ -324,8 +322,6 @@ allocated string).}
 @; ----------------------------------------
 @section{Locale-Specific String Operations}
 
-@declare-exporting[(lib "scheme/locale")]
-
 @defproc[(string-locale=? [str1 string?] [str2 string?] ...+)
  boolean?]{  Like @scheme[string=?], but the strings are compared in a
  locale-specific way, based the value of @scheme[current-locale]. See
diff --git a/collects/scribblings/reference/struct-inspectors.scrbl b/collects/scribblings/reference/struct-inspectors.scrbl
index dfd4b9701b..856914bb51 100644
--- a/collects/scribblings/reference/struct-inspectors.scrbl
+++ b/collects/scribblings/reference/struct-inspectors.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "inspectors"]{Structure Inspectors}
 
-@declare-exporting[(lib "scheme/inspector")]
-
 An @deftech{inspector} provides access to structure fields and
 structure type information without the normal field accessors and
 mutators. (Inspectors are also used to control access to module
diff --git a/collects/scribblings/reference/struct.scrbl b/collects/scribblings/reference/struct.scrbl
index b4479aa025..adb0636352 100644
--- a/collects/scribblings/reference/struct.scrbl
+++ b/collects/scribblings/reference/struct.scrbl
@@ -347,8 +347,6 @@ is inaccessible.)}
 @;------------------------------------------------------------------------
 @section[#:tag "structinfo"]{Structure Type Transformer Binding}
 
-@declare-exporting[(lib "scheme/struct-info.ss")]
-
 The @scheme[define-struct] form binds the name of a structure type as
 a @tech{transformer binding} that records the other identifiers bound
 to the structure type, the constructor procedure, the predicate
diff --git a/collects/scribblings/reference/subprocess.scrbl b/collects/scribblings/reference/subprocess.scrbl
index 7c3c9ceaea..2759cf2d2b 100644
--- a/collects/scribblings/reference/subprocess.scrbl
+++ b/collects/scribblings/reference/subprocess.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "subprocess"]{Processes}
 
-@declare-exporting[(lib "scheme/subprocess")]
-
 @defproc[(subprocess [stdout (or/c output-port? false/c)]
                      [stdin (or/c input-port? false/c)]
                      [stderr (or/c output-port? false/c)]
diff --git a/collects/scribblings/reference/sync.scrbl b/collects/scribblings/reference/sync.scrbl
index 075054da19..e5c8604366 100644
--- a/collects/scribblings/reference/sync.scrbl
+++ b/collects/scribblings/reference/sync.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "all-sync" #:style 'toc]{Synchronization}
 
-@declare-exporting[(lib "scheme/sync")]
-
 Scheme's synchronization toolbox spans three layers:
 
 @itemize{
diff --git a/collects/scribblings/reference/thread-cells.scrbl b/collects/scribblings/reference/thread-cells.scrbl
index e5f753150d..ca4bf4063f 100644
--- a/collects/scribblings/reference/thread-cells.scrbl
+++ b/collects/scribblings/reference/thread-cells.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "threadcells"]{Thread Cells}
 
-@declare-exporting[(lib "scheme/thread-cell")]
-
 A @deftech{thread cell} contains a thread-specific value; that is, it
 contains a specific value for each thread, but it may contain
 different values for different threads. A thread cell is created with
diff --git a/collects/scribblings/reference/thread-groups.scrbl b/collects/scribblings/reference/thread-groups.scrbl
index 68686235e4..522099fbe1 100644
--- a/collects/scribblings/reference/thread-groups.scrbl
+++ b/collects/scribblings/reference/thread-groups.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "threadgroups"]{Thread Groups}
 
-@declare-exporting[(lib "scheme/thread")]
-
 A @deftech{thread group} is a collection of threads and other thread
 groups that have equal claim to the CPU. By nesting thread groups and
 by creating certain threads within certain groups, a programmer can
diff --git a/collects/scribblings/reference/threads.scrbl b/collects/scribblings/reference/threads.scrbl
index ebc95d8f1d..ac924f0a0e 100644
--- a/collects/scribblings/reference/threads.scrbl
+++ b/collects/scribblings/reference/threads.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "threads"]{Threads}
 
-@declare-exporting[(lib "scheme/thread")]
-
 See @secref["thread-model"] for basic information on the PLT Scheme
 thread model.
 
diff --git a/collects/scribblings/reference/time.scrbl b/collects/scribblings/reference/time.scrbl
index 273844aedb..7f4c935325 100644
--- a/collects/scribblings/reference/time.scrbl
+++ b/collects/scribblings/reference/time.scrbl
@@ -3,8 +3,6 @@
 
 @title[#:tag "time"]{Time}
  
-@declare-exporting[(lib "scheme/time")]
-
 @defproc[(current-seconds) exact-integer?]{
 
 Returns the current time in seconds. This time is always an exact
diff --git a/collects/scribblings/reference/units.scrbl b/collects/scribblings/reference/units.scrbl
index adb3d84c4a..96c4ac50f7 100644
--- a/collects/scribblings/reference/units.scrbl
+++ b/collects/scribblings/reference/units.scrbl
@@ -23,7 +23,7 @@
 
 @title[#:tag "mzlib:unit" #:style 'toc]{Units}
 
-@declare-exporting[scheme/unit]
+@declare-exporting[scheme/unit scheme]
 
 @local-table-of-contents[]
 
diff --git a/collects/scribblings/reference/write.scrbl b/collects/scribblings/reference/write.scrbl
index 93db35c720..bc8656e787 100644
--- a/collects/scribblings/reference/write.scrbl
+++ b/collects/scribblings/reference/write.scrbl
@@ -6,8 +6,6 @@
 
 @title{Writing}
 
-@declare-exporting[(lib "scheme/write")]
-
 @defproc[(write [datum any/c][out output-port? (current-output-port)])
          void?]{