diff --git a/unstable/lens/lazy.rkt b/unstable/lens/lazy.rkt
index 192ff32..887e0c7 100644
--- a/unstable/lens/lazy.rkt
+++ b/unstable/lens/lazy.rkt
@@ -5,7 +5,10 @@ provide lazy-lens
 
 require fancy-app lens/private/base/main racket/promise
 module+ test
-  require rackunit "if.rkt" "isomorphism.rkt" "map.rkt"
+  require rackunit
+          lens/private/compound/if
+          lens/private/isomorphism/data
+          lens/private/list/map
 
 (define-syntax-rule (lazy-lens expr)
   (let ([p (delay expr)])
diff --git a/unstable/lens/syntax.rkt b/unstable/lens/syntax.rkt
index 0efe49b..b8b8ad4 100644
--- a/unstable/lens/syntax.rkt
+++ b/unstable/lens/syntax.rkt
@@ -1,3 +1,2 @@
 #lang reprovide
-"syntax/syntax.rkt"
-"syntax/syntax-keyword.rkt"
+"syntax/main.rkt"
diff --git a/unstable/lens/syntax/main.rkt b/unstable/lens/syntax/main.rkt
new file mode 100644
index 0000000..e2405ca
--- /dev/null
+++ b/unstable/lens/syntax/main.rkt
@@ -0,0 +1,3 @@
+#lang reprovide
+"syntax.rkt"
+"syntax-keyword.rkt"
diff --git a/unstable/lens/zoom.rkt b/unstable/lens/zoom.rkt
index ac663d0..faff3fe 100644
--- a/unstable/lens/zoom.rkt
+++ b/unstable/lens/zoom.rkt
@@ -17,7 +17,7 @@ module+ test
   require lens/private/list/main
           rackunit
           lens/private/isomorphism/data
-          "map.rkt"
+          lens/private/list/map
 
 ;; lens-zoom : (Lens (Outer Inner) Inner) (Lens A B) -> (Lens (Outer A) (Outer B))
 (define (lens-zoom zoom-lens transformer-lens)