diff --git a/collects/mzlib/async-channel.rkt b/collects/mzlib/async-channel.rkt
index 0b360c2..fa1a006 100644
--- a/collects/mzlib/async-channel.rkt
+++ b/collects/mzlib/async-channel.rkt
@@ -1,4 +1,3 @@
-#lang scheme/base
-
-(require scheme/async-channel)
-(provide (all-from-out scheme/async-channel))
+#lang racket/base
+(require racket/async-channel)
+(provide (all-from-out racket/async-channel))
diff --git a/collects/mzlib/cm-accomplice.rkt b/collects/mzlib/cm-accomplice.rkt
index b334c6d..74bdf45 100644
--- a/collects/mzlib/cm-accomplice.rkt
+++ b/collects/mzlib/cm-accomplice.rkt
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
(require compiler/cm-accomplice)
(provide (all-from-out compiler/cm-accomplice))
diff --git a/collects/mzlib/cm.rkt b/collects/mzlib/cm.rkt
index ffff67c..fb6006f 100644
--- a/collects/mzlib/cm.rkt
+++ b/collects/mzlib/cm.rkt
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
(require compiler/cm)
(provide (all-from-out compiler/cm))
diff --git a/collects/mzlib/cmdline.rkt b/collects/mzlib/cmdline.rkt
index 8a0fe49..1cce81e 100644
--- a/collects/mzlib/cmdline.rkt
+++ b/collects/mzlib/cmdline.rkt
@@ -1,6 +1,6 @@
#lang mzscheme
-(require (only scheme/cmdline parse-command-line))
+(require (only racket/cmdline parse-command-line))
(provide command-line
parse-command-line)
diff --git a/collects/mzlib/cml.rkt b/collects/mzlib/cml.rkt
index c618562..8eaf1b7 100644
--- a/collects/mzlib/cml.rkt
+++ b/collects/mzlib/cml.rkt
@@ -1,5 +1,5 @@
#lang racket/base
-(require racket/contract)
+(require racket/contract/base)
(define (spawn thunk)
(thread/suspend-to-kill thunk))
diff --git a/collects/mzlib/contract.rkt b/collects/mzlib/contract.rkt
index c8f9724..c241f8d 100644
--- a/collects/mzlib/contract.rkt
+++ b/collects/mzlib/contract.rkt
@@ -7,7 +7,7 @@
(require "private/contract-arrow.rkt")
(provide (all-from-out "private/contract-arrow.rkt"))
-(require (only-in racket/contract unconstrained-domain->))
+(require (only-in racket/contract/base unconstrained-domain->))
(provide unconstrained-domain->)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/collects/mzlib/date.rkt b/collects/mzlib/date.rkt
index 0dd0d9f..c37deea 100644
--- a/collects/mzlib/date.rkt
+++ b/collects/mzlib/date.rkt
@@ -3,7 +3,7 @@
racket/match
racket/list
racket/function
- racket/contract)
+ racket/contract/base)
(provide/contract
[current-date (-> date?)]
diff --git a/collects/mzlib/etc.rkt b/collects/mzlib/etc.rkt
index 376d0a8..7314700 100644
--- a/collects/mzlib/etc.rkt
+++ b/collects/mzlib/etc.rkt
@@ -1,22 +1,18 @@
#lang mzscheme
-
(require setup/main-collects
racket/local
racket/bool
racket/block
(only racket/function
identity)
- (only scheme/base
+ (only racket/base
build-string
build-list
build-vector
compose)
- (rename scheme/base base-else else)
- "kw.rkt")
+ (rename racket/base base-else else))
-(require-for-syntax syntax/kerncase
- syntax/stx
- syntax/name
+(require-for-syntax syntax/name
setup/main-collects
"private/stxset.rkt")
diff --git a/collects/mzlib/file.rkt b/collects/mzlib/file.rkt
index 944e1b0..40eee70 100644
--- a/collects/mzlib/file.rkt
+++ b/collects/mzlib/file.rkt
@@ -1,6 +1,6 @@
-(module file scheme/base
- (require scheme/file
- scheme/path
+(module file racket/base
+ (require racket/file
+ racket/path
(prefix-in mz: (only-in mzscheme
open-input-file
open-output-file)))
diff --git a/collects/mzlib/for.rkt b/collects/mzlib/for.rkt
index a44225d..c41ea2e 100644
--- a/collects/mzlib/for.rkt
+++ b/collects/mzlib/for.rkt
@@ -1,4 +1,4 @@
-(module for scheme/base
+(module for racket/base
(provide for/fold for*/fold
for for*
for/list for*/list
diff --git a/collects/mzlib/foreign.rkt b/collects/mzlib/foreign.rkt
index 00d2cce..e1f021c 100644
--- a/collects/mzlib/foreign.rkt
+++ b/collects/mzlib/foreign.rkt
@@ -1,4 +1,3 @@
-
-(module foreign scheme/base
+(module foreign racket/base
(require scheme/foreign)
(provide (all-from-out scheme/foreign)))
diff --git a/collects/mzlib/inflate.rkt b/collects/mzlib/inflate.rkt
index f51337c..5fa4b7a 100644
--- a/collects/mzlib/inflate.rkt
+++ b/collects/mzlib/inflate.rkt
@@ -1,5 +1,5 @@
-#lang scheme/base
-(require (for-syntax scheme/base))
+#lang racket/base
+(require (for-syntax racket/base))
(provide inflate
gunzip-through-ports
diff --git a/collects/mzlib/integer-set.rkt b/collects/mzlib/integer-set.rkt
index c32ff58..035cc6a 100644
--- a/collects/mzlib/integer-set.rkt
+++ b/collects/mzlib/integer-set.rkt
@@ -1,6 +1,6 @@
(module integer-set mzscheme
- (require (all-except mzlib/list merge)
- racket/contract)
+ (require (only racket/base foldr)
+ racket/contract/base)
#;(define-syntax test-block
(syntax-rules ()
diff --git a/collects/mzlib/list.rkt b/collects/mzlib/list.rkt
index ed658ee..3bae966 100644
--- a/collects/mzlib/list.rkt
+++ b/collects/mzlib/list.rkt
@@ -1,9 +1,9 @@
-#lang scheme/base
+#lang racket/base
;; The `first', etc. operations in this library
;; work on pairs, not lists.
-(require (only-in scheme/list
+(require (only-in racket/list
cons?
empty?
empty
diff --git a/collects/mzlib/math.rkt b/collects/mzlib/math.rkt
index 5a2db7b..bfc1841 100644
--- a/collects/mzlib/math.rkt
+++ b/collects/mzlib/math.rkt
@@ -1,6 +1,5 @@
-
-(module math scheme/base
- (require scheme/math)
- (provide (all-from-out scheme/math)
+(module math racket/base
+ (require racket/math)
+ (provide (all-from-out racket/math)
e)
(define e (exp 1.0)))
diff --git a/collects/mzlib/md5.rkt b/collects/mzlib/md5.rkt
index d1e0060..8a82a11 100644
--- a/collects/mzlib/md5.rkt
+++ b/collects/mzlib/md5.rkt
@@ -1,3 +1,3 @@
-#lang scheme/base
+#lang racket/base
(require file/md5)
(provide (all-from-out file/md5))
diff --git a/collects/mzlib/plt-match.rkt b/collects/mzlib/plt-match.rkt
index add845a..6814849 100644
--- a/collects/mzlib/plt-match.rkt
+++ b/collects/mzlib/plt-match.rkt
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
(require racket/match/match)
(provide (all-from-out racket/match/match))
diff --git a/collects/mzlib/port.rkt b/collects/mzlib/port.rkt
index 84fb89b..1c32172 100644
--- a/collects/mzlib/port.rkt
+++ b/collects/mzlib/port.rkt
@@ -2,7 +2,6 @@
(require (for-syntax racket/base)
racket/contract/base
- mzlib/list
"private/port.rkt")
(define (input-port-with-progress-evts? ip)
diff --git a/collects/mzlib/pregexp.rkt b/collects/mzlib/pregexp.rkt
index 5d2c494..f1773be 100644
--- a/collects/mzlib/pregexp.rkt
+++ b/collects/mzlib/pregexp.rkt
@@ -7,7 +7,7 @@
;; this is mostly a wrapper module.
(module pregexp mzscheme
- (require mzlib/string
+ (require (only racket/base regexp-quote regexp-split)
mzlib/kw)
(provide pregexp
pregexp-match-positions
diff --git a/collects/mzlib/pretty.rkt b/collects/mzlib/pretty.rkt
index 3dcd8ee..8e8238c 100644
--- a/collects/mzlib/pretty.rkt
+++ b/collects/mzlib/pretty.rkt
@@ -1,3 +1,3 @@
-(module pretty scheme/base
- (require scheme/pretty)
- (provide (all-from-out scheme/pretty)))
+(module pretty racket/base
+ (require racket/pretty)
+ (provide (all-from-out racket/pretty)))
diff --git a/collects/mzlib/private/contract-arr-checks.rkt b/collects/mzlib/private/contract-arr-checks.rkt
index 1bbf5d5..5a7ebe8 100644
--- a/collects/mzlib/private/contract-arr-checks.rkt
+++ b/collects/mzlib/private/contract-arr-checks.rkt
@@ -1,8 +1,7 @@
#lang racket/base
(provide (all-defined-out))
-(require racket/contract/private/guts
- racket/contract/private/blame
+(require racket/contract/private/blame
racket/contract/private/misc)
(define empty-case-lambda/c
diff --git a/collects/mzlib/private/contract-arr-obj-helpers.rkt b/collects/mzlib/private/contract-arr-obj-helpers.rkt
index d72c58c..12a1abc 100644
--- a/collects/mzlib/private/contract-arr-obj-helpers.rkt
+++ b/collects/mzlib/private/contract-arr-obj-helpers.rkt
@@ -1,9 +1,9 @@
-#lang scheme/base
+#lang racket/base
(require syntax/stx
syntax/name)
-(require (for-syntax scheme/base))
-(require (for-template scheme/base)
+(require (for-syntax racket/base))
+(require (for-template racket/base)
(for-template racket/contract/private/guts
racket/contract/private/misc
racket/contract/private/prop
diff --git a/collects/mzlib/private/contract-object.rkt b/collects/mzlib/private/contract-object.rkt
index 1a5840b..6aedcbb 100644
--- a/collects/mzlib/private/contract-object.rkt
+++ b/collects/mzlib/private/contract-object.rkt
@@ -7,7 +7,6 @@
"contract-arr-checks.rkt")
(require (for-syntax racket/base
- racket/contract/private/helpers
"contract-arr-obj-helpers.rkt"))
(provide object-contract)
diff --git a/collects/mzlib/private/package-helper.rkt b/collects/mzlib/private/package-helper.rkt
index 837f4df..1fbd25d 100644
--- a/collects/mzlib/private/package-helper.rkt
+++ b/collects/mzlib/private/package-helper.rkt
@@ -1,6 +1,5 @@
(module package-helper mzscheme
- (require syntax/stx
- syntax/boundmap)
+ (require syntax/boundmap)
(provide str str? str-renames str-all-renames make-str
check-defn-context
diff --git a/collects/mzlib/private/sigutil.rkt b/collects/mzlib/private/sigutil.rkt
index ff954ee..7615bab 100644
--- a/collects/mzlib/private/sigutil.rkt
+++ b/collects/mzlib/private/sigutil.rkt
@@ -9,7 +9,7 @@
(require "sigmatch.rkt")
(require "../unit200.rkt")
- (require "../list.rkt")
+ (require (only racket/base filter sort))
(define-struct signature (name ; sym
src ; sym
diff --git a/collects/mzlib/private/stxset.rkt b/collects/mzlib/private/stxset.rkt
index 7c056f9..123cf7b 100644
--- a/collects/mzlib/private/stxset.rkt
+++ b/collects/mzlib/private/stxset.rkt
@@ -1,5 +1,5 @@
-#lang scheme/base
-(require (for-syntax scheme/base
+#lang racket/base
+(require (for-syntax racket/base
syntax/kerncase
syntax/context))
diff --git a/collects/mzlib/private/unitidmap.rkt b/collects/mzlib/private/unitidmap.rkt
index 4eb5907..c9ab855 100644
--- a/collects/mzlib/private/unitidmap.rkt
+++ b/collects/mzlib/private/unitidmap.rkt
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
;; Help Desk binding info:
(define (binding binder bound stx)
diff --git a/collects/mzlib/process.rkt b/collects/mzlib/process.rkt
index b897927..693c01b 100644
--- a/collects/mzlib/process.rkt
+++ b/collects/mzlib/process.rkt
@@ -8,8 +8,7 @@
system/exit-code
system*/exit-code)
-(require mzlib/port
- "private/streams.rkt")
+(require "private/streams.rkt")
;; Helpers: ----------------------------------------
diff --git a/collects/mzlib/runtime-path.rkt b/collects/mzlib/runtime-path.rkt
index 2c96054..9fb0753 100644
--- a/collects/mzlib/runtime-path.rkt
+++ b/collects/mzlib/runtime-path.rkt
@@ -1,12 +1,9 @@
-
-(module runtime-path scheme/base
+(module runtime-path racket/base
(require mzlib/etc
- syntax/modcollapse
setup/dirs
- scheme/list
- scheme/string
+ racket/list
(only-in "private/runtime-path-table.rkt" table)
- (for-syntax scheme/base))
+ (for-syntax racket/base))
(provide define-runtime-path
define-runtime-paths
diff --git a/collects/mzlib/sendevent.rkt b/collects/mzlib/sendevent.rkt
index 74dd8ae..c28c169 100644
--- a/collects/mzlib/sendevent.rkt
+++ b/collects/mzlib/sendevent.rkt
@@ -1,5 +1,5 @@
-#lang scheme/base
-(require scheme/gui/dynamic)
+#lang racket/base
+(require racket/gui/dynamic)
(provide send-event)
diff --git a/collects/mzlib/serialize.rkt b/collects/mzlib/serialize.rkt
index e455013..8513cb6 100644
--- a/collects/mzlib/serialize.rkt
+++ b/collects/mzlib/serialize.rkt
@@ -1,9 +1,6 @@
(module serialize mzscheme
(require-for-syntax syntax/struct)
- (require syntax/modcollapse
- mzlib/etc
- mzlib/list
- ;; core [de]serializer:
+ (require ;; core [de]serializer:
racket/private/serialize)
(provide define-serializable-struct
diff --git a/collects/mzlib/shared.rkt b/collects/mzlib/shared.rkt
index 995bc9f..f6af9d4 100644
--- a/collects/mzlib/shared.rkt
+++ b/collects/mzlib/shared.rkt
@@ -1,11 +1,9 @@
-#lang scheme/base
-
-(require (for-syntax scheme/base
- syntax/stx
+#lang racket/base
+(require (for-syntax racket/base
syntax/kerncase
syntax/struct
racket/struct-info
- scheme/include))
+ racket/include))
(provide shared)
@@ -13,7 +11,7 @@
(#%variable-reference)))
(define undefined (letrec ([x x]) x))
-(require (only-in scheme/base [cons the-cons]))
+(require (only-in racket/base [cons the-cons]))
(define-syntax shared
(lambda (stx)
diff --git a/collects/mzlib/string.rkt b/collects/mzlib/string.rkt
index 6dfe715..7a15718 100644
--- a/collects/mzlib/string.rkt
+++ b/collects/mzlib/string.rkt
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
(provide string-lowercase!
string-uppercase!
diff --git a/collects/mzlib/struct.rkt b/collects/mzlib/struct.rkt
index a291c64..eb54208 100644
--- a/collects/mzlib/struct.rkt
+++ b/collects/mzlib/struct.rkt
@@ -6,7 +6,7 @@
define-struct/properties
make-->vector)
(require-for-syntax syntax/struct
- "list.rkt"
+ (only racket/base filter)
syntax/stx)
;; ------------------------------------------------------------
diff --git a/collects/mzlib/stxparam.rkt b/collects/mzlib/stxparam.rkt
index f4c98cf..19f1031 100644
--- a/collects/mzlib/stxparam.rkt
+++ b/collects/mzlib/stxparam.rkt
@@ -1,9 +1,8 @@
-
-(module stxparam scheme/base
- (require scheme/stxparam)
+(module stxparam racket/base
+ (require racket/stxparam)
(provide define-syntax-parameter
syntax-parameterize)
- (require scheme/stxparam-exptime)
+ (require racket/stxparam-exptime)
(provide syntax-parameter-value
make-parameter-rename-transformer))
diff --git a/collects/mzlib/surrogate.rkt b/collects/mzlib/surrogate.rkt
index fed7774..1f53f2f 100644
--- a/collects/mzlib/surrogate.rkt
+++ b/collects/mzlib/surrogate.rkt
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
-(require scheme/surrogate)
-(provide (all-from-out scheme/surrogate))
+(require racket/surrogate)
+(provide (all-from-out racket/surrogate))
diff --git a/collects/mzlib/tar.rkt b/collects/mzlib/tar.rkt
index c251ede..70cd531 100644
--- a/collects/mzlib/tar.rkt
+++ b/collects/mzlib/tar.rkt
@@ -1,3 +1,3 @@
-#lang scheme/base
+#lang racket/base
(require file/tar)
(provide (all-from-out file/tar))
diff --git a/collects/mzlib/traceld.rkt b/collects/mzlib/traceld.rkt
index 4d929fa..946d431 100644
--- a/collects/mzlib/traceld.rkt
+++ b/collects/mzlib/traceld.rkt
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
(let ([load (current-load)]
[load-extension (current-load-extension)]
diff --git a/collects/mzlib/trait.rkt b/collects/mzlib/trait.rkt
index 0088150..bfcc46e 100644
--- a/collects/mzlib/trait.rkt
+++ b/collects/mzlib/trait.rkt
@@ -1,3 +1,3 @@
-(module trait scheme/base
- (require scheme/trait)
- (provide (all-from-out scheme/trait)))
+(module trait racket/base
+ (require racket/trait)
+ (provide (all-from-out racket/trait)))
diff --git a/collects/mzlib/unit-exptime.rkt b/collects/mzlib/unit-exptime.rkt
index e192e56..df22354 100644
--- a/collects/mzlib/unit-exptime.rkt
+++ b/collects/mzlib/unit-exptime.rkt
@@ -1,4 +1,4 @@
-#lang scheme/base
+#lang racket/base
(require "private/unit-syntax.rkt"
"private/unit-compiletime.rkt")
diff --git a/collects/mzlib/unit.rkt b/collects/mzlib/unit.rkt
index 8f18c8f..7561aa3 100644
--- a/collects/mzlib/unit.rkt
+++ b/collects/mzlib/unit.rkt
@@ -1,25 +1,23 @@
-#lang scheme/base
+#lang racket/base
-(require (for-syntax scheme/base
- scheme/list
+(require (for-syntax racket/base
syntax/boundmap
syntax/context
syntax/kerncase
syntax/name
syntax/parse
syntax/struct
- scheme/struct-info
+ racket/struct-info
syntax/stx
syntax/location
"private/unit-contract-syntax.rkt"
"private/unit-compiletime.rkt"
"private/unit-syntax.rkt"))
-
-(require mzlib/etc
+
+(require racket/block
racket/contract/base
racket/contract/region
- racket/contract/combinator
- scheme/stxparam
+ racket/stxparam
syntax/location
"private/unit-contract.rkt"
"private/unit-keywords.rkt"
@@ -1154,7 +1152,7 @@
(apply append (map do-one ids tmps))))]
[else (list defn-or-expr)]))
expanded-body))])
- #'(begin-with-definitions defn-or-expr ...))))))))
+ #'(block defn-or-expr ...))))))))
(define-for-syntax (redirect-imports/exports import?)
(lambda (table-stx
diff --git a/collects/mzlib/unit200.rkt b/collects/mzlib/unit200.rkt
index 9247f12..d1dd8ec 100644
--- a/collects/mzlib/unit200.rkt
+++ b/collects/mzlib/unit200.rkt
@@ -7,7 +7,7 @@
syntax/name
syntax/context
racket/syntax
- "list.rkt"
+ (only racket/base filter)
"private/unitidmap.rkt")
;; ----------------------------------------------------------------------
diff --git a/collects/mzlib/unitsig200.rkt b/collects/mzlib/unitsig200.rkt
index 0c6256d..1cd69d5 100644
--- a/collects/mzlib/unitsig200.rkt
+++ b/collects/mzlib/unitsig200.rkt
@@ -9,7 +9,6 @@
(require "private/sigmatch.rkt")
(require-for-syntax "private/sigutil.rkt")
- (require-for-syntax "private/sigmatch.rkt")
(require-for-syntax syntax/kerncase)
(define-struct signed-unit (unit imports exports))
diff --git a/collects/mzlib/zip.rkt b/collects/mzlib/zip.rkt
index b404e6e..50cec2d 100644
--- a/collects/mzlib/zip.rkt
+++ b/collects/mzlib/zip.rkt
@@ -1,7 +1,7 @@
;; A modification of Dave Herman's zip module
(module zip mzscheme
- (require mzlib/deflate mzlib/file mzlib/kw)
+ (require mzlib/deflate racket/file mzlib/kw)
;; ===========================================================================
;; DATA DEFINITIONS
diff --git a/collects/racket/private/old-procs.rkt b/collects/racket/private/old-procs.rkt
index 632acb6..e18572f 100644
--- a/collects/racket/private/old-procs.rkt
+++ b/collects/racket/private/old-procs.rkt
@@ -2,8 +2,6 @@
(module old-procs '#%kernel
(#%require "small-scheme.rkt"
"more-scheme.rkt"
- "misc.rkt"
- "stxmz-body.rkt"
"define.rkt")
(#%provide make-namespace
diff --git a/collects/racket/private/stxmz-body.rkt b/collects/racket/private/stxmz-body.rkt
index e1c3ecf..39ccc18 100644
--- a/collects/racket/private/stxmz-body.rkt
+++ b/collects/racket/private/stxmz-body.rkt
@@ -2,7 +2,7 @@
;; mzscheme's `#%module-begin'
(module stxmz-body '#%kernel
- (#%require "stxcase-scheme.rkt" "define.rkt"
+ (#%require "define.rkt"
(for-syntax '#%kernel "stx.rkt"))
;; So that expansions print the way the Racket programmer expects: