diff --git a/racket/lib/collects/compiler/bundle-dist.rkt b/racket/lib/collects/compiler/bundle-dist.rkt
index 02a671be4f..e7b596d260 100644
--- a/racket/lib/collects/compiler/bundle-dist.rkt
+++ b/racket/lib/collects/compiler/bundle-dist.rkt
@@ -1,10 +1,11 @@
 
 (module bundle-dist mzscheme
-  (require mzlib/etc
-	   mzlib/file
-	   mzlib/process
-	   mzlib/zip
-	   mzlib/tar)
+  (require racket/file
+           (only racket/base lambda)
+           racket/path
+	   racket/system
+	   file/zip
+	   file/tar)
 
   (provide bundle-put-file-extension+style+filters
 	   bundle-directory)
@@ -61,7 +62,7 @@
 	      (lambda () (delete-directory/files temp-dir))))))
 
   (define bundle-directory
-    (opt-lambda (target dir [for-exe? #f])
+    (lambda (target dir [for-exe? #f])
       (let ([target (add-suffix target (bundle-file-suffix))])
 	(case (system-type)
 	  [(macosx)
diff --git a/racket/lib/collects/compiler/embed-sig.rkt b/racket/lib/collects/compiler/embed-sig.rkt
index a5e949c9a8..e7cac31ad2 100644
--- a/racket/lib/collects/compiler/embed-sig.rkt
+++ b/racket/lib/collects/compiler/embed-sig.rkt
@@ -1,6 +1,6 @@
 
 (module embed-sig mzscheme
-  (require mzlib/unit)
+  (require racket/unit)
   (provide compiler:embed^)
 
   (define-signature compiler:embed^
diff --git a/racket/lib/collects/compiler/sig.rkt b/racket/lib/collects/compiler/sig.rkt
index 63267b13c5..860a07eb70 100644
--- a/racket/lib/collects/compiler/sig.rkt
+++ b/racket/lib/collects/compiler/sig.rkt
@@ -1,7 +1,7 @@
 
 #lang mzscheme
 
-(require mzlib/unit)
+(require racket/unit)
 
 (provide compiler:option^
          compiler^)
diff --git a/racket/lib/collects/compiler/zo-structs.rkt b/racket/lib/collects/compiler/zo-structs.rkt
index 1221cdad02..52be542051 100644
--- a/racket/lib/collects/compiler/zo-structs.rkt
+++ b/racket/lib/collects/compiler/zo-structs.rkt
@@ -1,6 +1,5 @@
 #lang scheme/base
-(require mzlib/etc 
-         scheme/match
+(require scheme/match
          scheme/contract
          scheme/list
          racket/set)
diff --git a/racket/lib/collects/setup/option-sig.rkt b/racket/lib/collects/setup/option-sig.rkt
index aa4f6abb4c..8dad393247 100644
--- a/racket/lib/collects/setup/option-sig.rkt
+++ b/racket/lib/collects/setup/option-sig.rkt
@@ -1,6 +1,6 @@
 
 (module option-sig mzscheme
-  (require mzlib/unit)
+  (require racket/unit)
   
   (provide setup-option^)