diff --git a/collects/mzlib/cm-accomplice.ss b/collects/mzlib/cm-accomplice.ss
index 69ed372..6d7e07e 100644
--- a/collects/mzlib/cm-accomplice.ss
+++ b/collects/mzlib/cm-accomplice.ss
@@ -12,7 +12,7 @@
       (thread-wait 
        (thread (lambda ()
 		 (set! param
-		       (dynamic-require '(lib "cm-ctime.ss" "mzlib/private")
+		       (dynamic-require 'mzlib/private/cm-ctime
 					'current-external-file-registrar)))))
       ((param) f))))
 
diff --git a/collects/mzlib/cm.ss b/collects/mzlib/cm.ss
index 252ce1c..47afb59 100644
--- a/collects/mzlib/cm.ss
+++ b/collects/mzlib/cm.ss
@@ -1,7 +1,7 @@
 (module cm scheme/base
   (require syntax/modcode
            syntax/modresolve
-	   (lib "main-collects.ss" "setup")
+	   setup/main-collects
 	   scheme/file)
 
   (provide make-compilation-manager-load/use-compiled-handler
diff --git a/collects/mzlib/etc.ss b/collects/mzlib/etc.ss
index 3f9c697..1e72899 100644
--- a/collects/mzlib/etc.ss
+++ b/collects/mzlib/etc.ss
@@ -1,6 +1,6 @@
 #lang mzscheme
 
-(require (lib "main-collects.ss" "setup")
+(require setup/main-collects
          scheme/local
          scheme/bool
          (only scheme/base
@@ -14,7 +14,7 @@
 (require-for-syntax syntax/kerncase
                     syntax/stx
                     syntax/name
-                    (lib "main-collects.ss" "setup")
+                    setup/main-collects
                     "private/stxset.ss")
 
 (provide boolean=? symbol=?
diff --git a/collects/mzlib/match.ss b/collects/mzlib/match.ss
index 6bfea8a..d38a78a 100644
--- a/collects/mzlib/match.ss
+++ b/collects/mzlib/match.ss
@@ -1,4 +1,4 @@
 #lang scheme/base
 
 (require scheme/match/legacy-match)
-(provide (all-from-out scheme/match/legacy-match))
\ No newline at end of file
+(provide (all-from-out scheme/match/legacy-match))
diff --git a/collects/mzlib/plt-match.ss b/collects/mzlib/plt-match.ss
index fa39217..84e08e6 100644
--- a/collects/mzlib/plt-match.ss
+++ b/collects/mzlib/plt-match.ss
@@ -1,4 +1,4 @@
 #lang scheme/base
 
 (require scheme/match/match)
-(provide (all-from-out scheme/match/match))
\ No newline at end of file
+(provide (all-from-out scheme/match/match))
diff --git a/collects/mzlib/pretty.ss b/collects/mzlib/pretty.ss
index b5fab1c..91e7aea 100644
--- a/collects/mzlib/pretty.ss
+++ b/collects/mzlib/pretty.ss
@@ -10,7 +10,7 @@
 ;;      (current-print pretty-print-handler)
 
 (module pretty mzscheme
-   (require (lib "port.ss" "mzlib" "private"))
+   (require mzlib/private/port)
 
    (provide pretty-print
 	    pretty-display
diff --git a/collects/tests/mzscheme/unit.ss b/collects/tests/mzscheme/unit.ss
index 7358951..2769308 100644
--- a/collects/tests/mzscheme/unit.ss
+++ b/collects/tests/mzscheme/unit.ss
@@ -2,7 +2,7 @@
 (load-relative "loadtest.ss")
 
 (Section 'unit)
-(require (lib "mzlib/unit200.ss"))
+(require mzlib/unit200)
 
 ;; Hide keywords from scheme/unit.ss:
 (define import #f)
diff --git a/collects/tests/mzscheme/unitsig.ss b/collects/tests/mzscheme/unitsig.ss
index 654fb2e..57b3539 100644
--- a/collects/tests/mzscheme/unitsig.ss
+++ b/collects/tests/mzscheme/unitsig.ss
@@ -6,9 +6,9 @@
 (define export #f)
 (define link #f)
 
-(require (lib "mzlib/unit200.ss"))
-(require (lib "mzlib/unitsig200.ss"))
-(require (lib "mzlib/include.ss"))
+(require mzlib/unit200)
+(require mzlib/unitsig200)
+(require mzlib/include)
 
 (Section 'unit/sig)