diff --git a/collects/tests/typed-scheme/fail/back-and-forth.ss b/collects/tests/typed-scheme/fail/back-and-forth.ss
index 3144b9a3..e8548984 100644
--- a/collects/tests/typed-scheme/fail/back-and-forth.ss
+++ b/collects/tests/typed-scheme/fail/back-and-forth.ss
@@ -15,4 +15,4 @@
 (module o typed-scheme
   (require 'n))
 
-(require 'o)
\ No newline at end of file
+(require 'o)
diff --git a/collects/tests/typed-scheme/fail/bad-type-app.ss b/collects/tests/typed-scheme/fail/bad-type-app.ss
index 581e73e5..3af92cbb 100644
--- a/collects/tests/typed-scheme/fail/bad-type-app.ss
+++ b/collects/tests/typed-scheme/fail/bad-type-app.ss
@@ -12,4 +12,4 @@
 (define-typed-struct (type-un   type) ([cases : (Listof type)])               #:transparent)
 (define-typed-struct (type-vals type) ([elems : (Listof type)])               #:transparent)
 
-(define-typed-struct (type-poly type) ([vars  : (Listof (U (type-dots type-var) type-var))]))
\ No newline at end of file
+(define-typed-struct (type-poly type) ([vars  : (Listof (U (type-dots type-var) type-var))]))
diff --git a/collects/tests/typed-scheme/fail/box-fail.ss b/collects/tests/typed-scheme/fail/box-fail.ss
index c1f45c60..4d53f3ef 100644
--- a/collects/tests/typed-scheme/fail/box-fail.ss
+++ b/collects/tests/typed-scheme/fail/box-fail.ss
@@ -5,4 +5,4 @@
 (let ()
   (: x (Boxof Number))
   (define x (box "foo"))
-  x)
\ No newline at end of file
+  x)
diff --git a/collects/tests/typed-scheme/fail/cnt-err1.ss b/collects/tests/typed-scheme/fail/cnt-err1.ss
index fa236bc8..40c3ca3b 100644
--- a/collects/tests/typed-scheme/fail/cnt-err1.ss
+++ b/collects/tests/typed-scheme/fail/cnt-err1.ss
@@ -25,4 +25,4 @@
 
 (require 'client)
 
-(try-it #t)
\ No newline at end of file
+(try-it #t)
diff --git a/collects/tests/typed-scheme/fail/pr9053-fail.ss b/collects/tests/typed-scheme/fail/pr9053-fail.ss
index 76863505..93c513b0 100644
--- a/collects/tests/typed-scheme/fail/pr9053-fail.ss
+++ b/collects/tests/typed-scheme/fail/pr9053-fail.ss
@@ -16,4 +16,4 @@
   (require-typed-struct term ([posn : Number]) 'source)
   (require-typed-struct (var term) (
                              [id : Symbol])
-                        'source))
\ No newline at end of file
+                        'source))
diff --git a/collects/tests/typed-scheme/fail/set-tests.ss b/collects/tests/typed-scheme/fail/set-tests.ss
index bd359d04..13f99b1d 100644
--- a/collects/tests/typed-scheme/fail/set-tests.ss
+++ b/collects/tests/typed-scheme/fail/set-tests.ss
@@ -6,4 +6,3 @@
 	(f : (-> Void) (lambda () (set! x (quote foo)))))
        (if (number? x) (begin (f) (add1 x)) 12))
 
- 
\ No newline at end of file
diff --git a/collects/tests/typed-scheme/succeed/apply-append.ss b/collects/tests/typed-scheme/succeed/apply-append.ss
index 93930726..fc996517 100644
--- a/collects/tests/typed-scheme/succeed/apply-append.ss
+++ b/collects/tests/typed-scheme/succeed/apply-append.ss
@@ -1,4 +1,4 @@
 #lang typed-scheme
 
 (apply append '((1 2 3) (4 5 6)))
-(apply append (list (list 1 2 3) (list 4 5 6)))
\ No newline at end of file
+(apply append (list (list 1 2 3) (list 4 5 6)))
diff --git a/collects/tests/typed-scheme/succeed/bad-map-infer.ss b/collects/tests/typed-scheme/succeed/bad-map-infer.ss
index 9ce634cb..6e9a97d7 100644
--- a/collects/tests/typed-scheme/succeed/bad-map-infer.ss
+++ b/collects/tests/typed-scheme/succeed/bad-map-infer.ss
@@ -2,4 +2,4 @@
 
 (: cross1 ((Listof Number) -> (Listof Number)))
 (define (cross1 m)
-  (map (lambda: ([m1 : Number]) #{(error 'bad) :: Number}) m))
\ No newline at end of file
+  (map (lambda: ([m1 : Number]) #{(error 'bad) :: Number}) m))
diff --git a/collects/tests/typed-scheme/succeed/basic-tests.ss b/collects/tests/typed-scheme/succeed/basic-tests.ss
index 8ca4f27a..3413470e 100644
--- a/collects/tests/typed-scheme/succeed/basic-tests.ss
+++ b/collects/tests/typed-scheme/succeed/basic-tests.ss
@@ -1,7 +1,7 @@
 #lang typed-scheme
 ;;syntax-only requires
-(require (only-in (lib "etc.ss") let+))
-(require (only-in (lib "match.ss") match))
+(require (only-in mzlib/etc let+))
+(require (only-in mzlib/match match))
 
 (define-type-alias number Number)
 (define-type-alias boolean Boolean)
diff --git a/collects/tests/typed-scheme/succeed/box-num.ss b/collects/tests/typed-scheme/succeed/box-num.ss
index 5cf003e4..c0e37428 100644
--- a/collects/tests/typed-scheme/succeed/box-num.ss
+++ b/collects/tests/typed-scheme/succeed/box-num.ss
@@ -5,4 +5,4 @@
 (let ()
   (: x (Boxof Number))
   (define x (box 1))
-  x)
\ No newline at end of file
+  x)
diff --git a/collects/tests/typed-scheme/succeed/broken-let-syntax.ss b/collects/tests/typed-scheme/succeed/broken-let-syntax.ss
index 4fd593c9..1817b32e 100644
--- a/collects/tests/typed-scheme/succeed/broken-let-syntax.ss
+++ b/collects/tests/typed-scheme/succeed/broken-let-syntax.ss
@@ -4,5 +4,3 @@
       (let-syntax ([m (syntax-rules ()
 			[(_) x])])
 	(m)))
-  
-  
\ No newline at end of file
diff --git a/collects/tests/typed-scheme/succeed/int-def-colon.ss b/collects/tests/typed-scheme/succeed/int-def-colon.ss
index 991b709c..b74ff402 100644
--- a/collects/tests/typed-scheme/succeed/int-def-colon.ss
+++ b/collects/tests/typed-scheme/succeed/int-def-colon.ss
@@ -7,4 +7,4 @@
  (: loop (Int -> Int))
  (define (loop x)
    (loop x))
- (loop 0))
\ No newline at end of file
+ (loop 0))
diff --git a/collects/tests/typed-scheme/succeed/leftist-heap.ss b/collects/tests/typed-scheme/succeed/leftist-heap.ss
index 81651f7c..0423a4a3 100644
--- a/collects/tests/typed-scheme/succeed/leftist-heap.ss
+++ b/collects/tests/typed-scheme/succeed/leftist-heap.ss
@@ -34,10 +34,10 @@
 (define-type-alias top Any)
 (define-type-alias list-of Listof)
 (require 
-   (except-in (lib "67.ss" "srfi") current-compare =? <?)
+   (except-in srfi/67 current-compare =? <?)
    #;"typed-list.ss"
-   #;(lib "42.ss" "srfi")
-   #;(only (lib "list.ss") foldl))
+   #;srfi/42
+   #;(only mzlib/list foldl))
     
   #;(provide (all-defined))
   (provide comparator Heap elements empty fold heap-node? find-min empty? insert insert* delete-min size union)
@@ -48,9 +48,9 @@
   
   ;; fixme - type aliases should work in require
   
-  (require/typed current-compare (-> (top top -> number)) (lib "67.ss" "srfi"))
-  (require/typed =? ((top top -> number) top top -> boolean) (lib "67.ss" "srfi"))
-  (require/typed <? ((top top -> number) top top -> boolean) (lib "67.ss" "srfi"))
+  (require/typed current-compare (-> (top top -> number)) srfi/67)
+  (require/typed =? ((top top -> number) top top -> boolean) srfi/67)
+  (require/typed <? ((top top -> number) top top -> boolean) srfi/67)
   
   ;;; DATA DEFINITION
   
diff --git a/collects/tests/typed-scheme/succeed/list-ref-vec.ss b/collects/tests/typed-scheme/succeed/list-ref-vec.ss
index a602f903..56b4d30d 100644
--- a/collects/tests/typed-scheme/succeed/list-ref-vec.ss
+++ b/collects/tests/typed-scheme/succeed/list-ref-vec.ss
@@ -3,4 +3,4 @@
 (: x : (Listof (Vectorof Integer)))
 (define x (list (vector 1 2 3)))
 
-(list-ref x 0)
\ No newline at end of file
+(list-ref x 0)
diff --git a/collects/tests/typed-scheme/succeed/little-schemer.ss b/collects/tests/typed-scheme/succeed/little-schemer.ss
index d363763f..24f453e7 100644
--- a/collects/tests/typed-scheme/succeed/little-schemer.ss
+++ b/collects/tests/typed-scheme/succeed/little-schemer.ss
@@ -1,7 +1,7 @@
 #lang typed-scheme  
-#;(require (lib "etc.ss"))
+#;(require mzlib/etc)
 #;(require "prims.ss")
-(require (lib "match.ss")
+(require mzlib/match
          (for-syntax scheme/base))
 
 (define-type-alias number Number)
diff --git a/collects/tests/typed-scheme/succeed/manual-examples.ss b/collects/tests/typed-scheme/succeed/manual-examples.ss
index 47e60d8d..5c6f9731 100644
--- a/collects/tests/typed-scheme/succeed/manual-examples.ss
+++ b/collects/tests/typed-scheme/succeed/manual-examples.ss
@@ -71,4 +71,3 @@
     (cond [(null? l) (make-Nothing)]
           [(= v (car l)) (make-Just v)]
           [else (find v (cdr l))])))
-  
\ No newline at end of file
diff --git a/collects/tests/typed-scheme/succeed/map1.ss b/collects/tests/typed-scheme/succeed/map1.ss
index 6d6a9d99..5c4e67a0 100644
--- a/collects/tests/typed-scheme/succeed/map1.ss
+++ b/collects/tests/typed-scheme/succeed/map1.ss
@@ -3,4 +3,4 @@
 (: f ((U String Number) -> Void))
 (define (f x) (void))
 
-(map f (list 1 2 3))
\ No newline at end of file
+(map f (list 1 2 3))
diff --git a/collects/tests/typed-scheme/succeed/map2.ss b/collects/tests/typed-scheme/succeed/map2.ss
index fa95e5ad..f82a06a1 100644
--- a/collects/tests/typed-scheme/succeed/map2.ss
+++ b/collects/tests/typed-scheme/succeed/map2.ss
@@ -1,4 +1,4 @@
 #lang typed-scheme 
 
 (map add1 #{(list 1 2 3) :: (Listof Integer)})
-(map add1 #{(list 1 2 3) :: (Listof Number)})
\ No newline at end of file
+(map add1 #{(list 1 2 3) :: (Listof Number)})
diff --git a/collects/tests/typed-scheme/succeed/match-expander-problem.ss b/collects/tests/typed-scheme/succeed/match-expander-problem.ss
index c26e3fbc..dd563dfc 100644
--- a/collects/tests/typed-scheme/succeed/match-expander-problem.ss
+++ b/collects/tests/typed-scheme/succeed/match-expander-problem.ss
@@ -1,8 +1,8 @@
 #lang typed-scheme
 
-#;(require (lib "etc.ss"))
+#;(require mzlib/etc)
 ;(require "prims.ss")
-(require (lib "match.ss"))
+(require mzlib/match)
 
 (define-typed-struct pt ([x : Number] [y : Number]))
 
diff --git a/collects/tests/typed-scheme/succeed/match.ss b/collects/tests/typed-scheme/succeed/match.ss
index 74102759..b103770a 100644
--- a/collects/tests/typed-scheme/succeed/match.ss
+++ b/collects/tests/typed-scheme/succeed/match.ss
@@ -4,4 +4,4 @@
 
 (match 1
   [2 3]
-  [x 4])
\ No newline at end of file
+  [x 4])
diff --git a/collects/tests/typed-scheme/succeed/metrics.ss b/collects/tests/typed-scheme/succeed/metrics.ss
index 150261ab..5e6d2eb0 100644
--- a/collects/tests/typed-scheme/succeed/metrics.ss
+++ b/collects/tests/typed-scheme/succeed/metrics.ss
@@ -16,13 +16,13 @@
 (require/typed explode-path (Path -> (Listof Path)) (lib "file.ss"))
 (require/typed srfi48::format (Port String String top .. -> top)  "patch.ss")
 ;; FIXME - prefix
-#;(require/typed srfi48:format ( Port String String top .. -> top) (prefix-in srfi48: (lib "48.ss" "srfi")))
-(require (lib "match.ss")
-         ;(lib "file.ss")
-         ;(lib "list.ss")
-         ;(lib "etc.ss")
-         (prefix-in srfi13: (lib "13.ss" "srfi"))
-         ;(prefix srfi48: (lib "48.ss" "srfi"))
+#;(require/typed srfi48:format ( Port String String top .. -> top) (prefix-in srfi48: srfi/48))
+(require mzlib/match
+         ;mzlib/file
+         ;mzlib/list
+         ;mzlib/etc
+         (prefix-in srfi13: srfi/13)
+         ;(prefix srfi48: srfi/48)
          )
 
 (define-type-alias Sexpr Any)
diff --git a/collects/tests/typed-scheme/succeed/param.ss b/collects/tests/typed-scheme/succeed/param.ss
index 80633fbb..e149b2c3 100644
--- a/collects/tests/typed-scheme/succeed/param.ss
+++ b/collects/tests/typed-scheme/succeed/param.ss
@@ -2,4 +2,4 @@
 
 (parameterize ([current-directory ".."])
   (current-directory)
-  (current-directory ".."))
\ No newline at end of file
+  (current-directory ".."))
diff --git a/collects/tests/typed-scheme/succeed/patch.ss b/collects/tests/typed-scheme/succeed/patch.ss
index c4d18dc0..4dc7c763 100644
--- a/collects/tests/typed-scheme/succeed/patch.ss
+++ b/collects/tests/typed-scheme/succeed/patch.ss
@@ -1,3 +1,3 @@
 (module patch scheme
   (define srfi48::format format)
-  (provide srfi48::format))
\ No newline at end of file
+  (provide srfi48::format))
diff --git a/collects/tests/typed-scheme/succeed/pr9046.ss b/collects/tests/typed-scheme/succeed/pr9046.ss
index 13857699..6bfa62b5 100644
--- a/collects/tests/typed-scheme/succeed/pr9046.ss
+++ b/collects/tests/typed-scheme/succeed/pr9046.ss
@@ -8,4 +8,4 @@
 
 (module foo typed-scheme
 
-  (require/opaque-type Srcloc s:srcloc? 'srcloc))
\ No newline at end of file
+  (require/opaque-type Srcloc s:srcloc? 'srcloc))
diff --git a/collects/tests/typed-scheme/succeed/pr9048.ss b/collects/tests/typed-scheme/succeed/pr9048.ss
index 412121e7..d2c8fdcf 100644
--- a/collects/tests/typed-scheme/succeed/pr9048.ss
+++ b/collects/tests/typed-scheme/succeed/pr9048.ss
@@ -2,7 +2,7 @@
 
 (module source mzscheme
 
-    (require (lib "contract.ss"))
+    (require mzlib/contract)
 
     (define-struct ast (loc))
 
@@ -11,4 +11,4 @@
 
 (module client typed-scheme
   
-  (require-typed-struct ast ([loc : Any]) 'source))
\ No newline at end of file
+  (require-typed-struct ast ([loc : Any]) 'source))
diff --git a/collects/tests/typed-scheme/succeed/pr9053.ss b/collects/tests/typed-scheme/succeed/pr9053.ss
index f66df690..27d4d421 100644
--- a/collects/tests/typed-scheme/succeed/pr9053.ss
+++ b/collects/tests/typed-scheme/succeed/pr9053.ss
@@ -14,4 +14,4 @@
   (require-typed-struct term ([posn : Number]) 'source)
   (require-typed-struct var (
                              [id : Symbol])
-                        'source))
\ No newline at end of file
+                        'source))
diff --git a/collects/tests/typed-scheme/succeed/pr9054.ss b/collects/tests/typed-scheme/succeed/pr9054.ss
index cee0aa29..ed1ea61f 100644
--- a/collects/tests/typed-scheme/succeed/pr9054.ss
+++ b/collects/tests/typed-scheme/succeed/pr9054.ss
@@ -13,4 +13,4 @@
  
   (define-type-alias Srcloc Any)
  
-  (require-typed-struct term ([posn : Srcloc]) 'source))
\ No newline at end of file
+  (require-typed-struct term ([posn : Srcloc]) 'source))
diff --git a/collects/tests/typed-scheme/succeed/provide-struct.ss b/collects/tests/typed-scheme/succeed/provide-struct.ss
index ad29cb52..278bca74 100644
--- a/collects/tests/typed-scheme/succeed/provide-struct.ss
+++ b/collects/tests/typed-scheme/succeed/provide-struct.ss
@@ -13,4 +13,4 @@
   (m:foo (m:make-x 1 #f))
   m:x?)
 
-(require 'n)
\ No newline at end of file
+(require 'n)
diff --git a/collects/tests/typed-scheme/succeed/provide-syntax.ss b/collects/tests/typed-scheme/succeed/provide-syntax.ss
index ba99a6ed..057a4266 100644
--- a/collects/tests/typed-scheme/succeed/provide-syntax.ss
+++ b/collects/tests/typed-scheme/succeed/provide-syntax.ss
@@ -2,4 +2,4 @@
 
 (define-syntax-rule (foo) 1)
 
-(provide foo)
\ No newline at end of file
+(provide foo)
diff --git a/collects/tests/typed-scheme/succeed/random-bits.ss b/collects/tests/typed-scheme/succeed/random-bits.ss
index 094cb2f4..725d7e5a 100644
--- a/collects/tests/typed-scheme/succeed/random-bits.ss
+++ b/collects/tests/typed-scheme/succeed/random-bits.ss
@@ -11,14 +11,14 @@
 ; 3. The non-generic parts (record type, time, error) are here.
 ;
 ; load the module with
-;   (require (lib "random-bits.ss" "srfi"))
+;   (require srfi/random-bits)
 ;
 ; history of this file:
 ;   SE, 17-May-2003: initial version
 
 (module random-bits typed-scheme
-  #;(require (lib "9.ss" "srfi"))
-  #;(require (lib "23.ss" "srfi"))
+  #;(require srfi/9)
+  #;(require srfi/23)
 
   (provide 
    random-integer random-real default-random-source
diff --git a/collects/tests/typed-scheme/succeed/require-poly.ss b/collects/tests/typed-scheme/succeed/require-poly.ss
index 5c12f98f..68f90fc9 100644
--- a/collects/tests/typed-scheme/succeed/require-poly.ss
+++ b/collects/tests/typed-scheme/succeed/require-poly.ss
@@ -1,3 +1,3 @@
 #lang typed-scheme
 
-(require "simple-poly.ss")
\ No newline at end of file
+(require "simple-poly.ss")
diff --git a/collects/tests/typed-scheme/succeed/require-tests.ss b/collects/tests/typed-scheme/succeed/require-tests.ss
index 50f16b0b..692278f5 100644
--- a/collects/tests/typed-scheme/succeed/require-tests.ss
+++ b/collects/tests/typed-scheme/succeed/require-tests.ss
@@ -8,4 +8,4 @@
 (module trequire typed-scheme
   (require 'bang-tests)
   (define: y : Number x)
-  (display y))
\ No newline at end of file
+  (display y))
diff --git a/collects/tests/typed-scheme/succeed/seasoned-schemer.ss b/collects/tests/typed-scheme/succeed/seasoned-schemer.ss
index 361ff9ff..3c52ea01 100644
--- a/collects/tests/typed-scheme/succeed/seasoned-schemer.ss
+++ b/collects/tests/typed-scheme/succeed/seasoned-schemer.ss
@@ -1,7 +1,7 @@
 #lang typed-scheme  
-#;(require (lib "etc.ss"))
+#;(require mzlib/etc)
 #;(require "prims.ss")
-(require (lib "match.ss"))
+(require mzlib/match)
 
 (define-type-alias number Number)
 (define-type-alias boolean Boolean)
diff --git a/collects/tests/typed-scheme/succeed/simple-poly.ss b/collects/tests/typed-scheme/succeed/simple-poly.ss
index d4e8db72..e52545f1 100644
--- a/collects/tests/typed-scheme/succeed/simple-poly.ss
+++ b/collects/tests/typed-scheme/succeed/simple-poly.ss
@@ -2,4 +2,4 @@
   (: f (All (a) (a -> a)))
   (define (f x) x)
   (define: z : Any 2)
-  (provide f))
\ No newline at end of file
+  (provide f))
diff --git a/collects/tests/typed-scheme/succeed/string-const.ss b/collects/tests/typed-scheme/succeed/string-const.ss
index 39354bc7..9437ae14 100644
--- a/collects/tests/typed-scheme/succeed/string-const.ss
+++ b/collects/tests/typed-scheme/succeed/string-const.ss
@@ -2,4 +2,4 @@
 
 (require string-constants/string-constant)
 
-(string-constant cancel)
\ No newline at end of file
+(string-constant cancel)
diff --git a/collects/tests/typed-scheme/succeed/struct-cert.ss b/collects/tests/typed-scheme/succeed/struct-cert.ss
index f0317d1a..0cd05d15 100644
--- a/collects/tests/typed-scheme/succeed/struct-cert.ss
+++ b/collects/tests/typed-scheme/succeed/struct-cert.ss
@@ -13,4 +13,4 @@
   ;; Comment out the below and it works fine.
   (provide (all-defined-out)))
 
-(require 'broken)
\ No newline at end of file
+(require 'broken)
diff --git a/collects/tests/typed-scheme/succeed/struct-exec.ss b/collects/tests/typed-scheme/succeed/struct-exec.ss
index 01e1dd82..23fb3d06 100644
--- a/collects/tests/typed-scheme/succeed/struct-exec.ss
+++ b/collects/tests/typed-scheme/succeed/struct-exec.ss
@@ -1,4 +1,3 @@
 #lang typed-scheme
 (define-typed-struct/exec X ([a : Number] [b : Boolean]) [(lambda: ([x : X]) (+ 3 )) : (X -> Number)])
 ((make-X 1 #f))
-  
\ No newline at end of file
diff --git a/collects/tests/typed-scheme/succeed/typeann-letrec.ss b/collects/tests/typed-scheme/succeed/typeann-letrec.ss
index ed6a4d65..3a56eb16 100644
--- a/collects/tests/typed-scheme/succeed/typeann-letrec.ss
+++ b/collects/tests/typed-scheme/succeed/typeann-letrec.ss
@@ -2,4 +2,4 @@
 
 (letrec-syntaxes+values () ([(#{x : Number}) (values 1)]) #{(vector x) :: (Vectorof Number)})
 (letrec-values ([(#{x : Number}) (values 1)]) #{(vector x) :: (Vectorof Number)})
-(letrec ([#{x : Number} (values 1)]) #{(vector x) :: (Vectorof Number)})
\ No newline at end of file
+(letrec ([#{x : Number} (values 1)]) #{(vector x) :: (Vectorof Number)})
diff --git a/collects/typed-scheme/private/base-types.ss b/collects/typed-scheme/private/base-types.ss
index aca610a8..1790b12b 100644
--- a/collects/typed-scheme/private/base-types.ss
+++ b/collects/typed-scheme/private/base-types.ss
@@ -85,4 +85,4 @@
   Parameter Tuple Class
   )  
 
-(provide-extra-tnames)
\ No newline at end of file
+(provide-extra-tnames)
diff --git a/collects/typed-scheme/private/prims.ss b/collects/typed-scheme/private/prims.ss
index 862ad929..7d051062 100644
--- a/collects/typed-scheme/private/prims.ss
+++ b/collects/typed-scheme/private/prims.ss
@@ -25,20 +25,20 @@ This file defines two sorts of primitives. All of them are provided into any mod
 (require (for-syntax 
           scheme/base
           "type-rep.ss"
-          (lib "match.ss")
+          mzlib/match
           "parse-type.ss"
-          (lib "struct.ss" "syntax")
-          (lib "stx.ss" "syntax")
-          "utils.ss"   
+          syntax/struct
+          syntax/stx
+          "utils.ss"
           "tc-utils.ss"
           "type-name-env.ss"
           "type-contract.ss"))
 
 (require "require-contract.ss"
          "internal-forms.ss"
-         (except-in (lib "contract.ss") ->)
-         (only-in (lib "contract.ss") [-> c->])
-         (lib "struct.ss")
+         (except-in mzlib/contract ->)
+         (only-in mzlib/contract [-> c->])
+         mzlib/struct
          "base-types.ss")
 
 (define-for-syntax (ignore stx) (syntax-property stx 'typechecker:ignore #t))