diff --git a/collects/web-server/prototype-web-server/lang-api.ss b/collects/web-server/prototype-web-server/lang-api.ss
index 4057105705..baed042c96 100644
--- a/collects/web-server/prototype-web-server/lang-api.ss
+++ b/collects/web-server/prototype-web-server/lang-api.ss
@@ -1,6 +1,12 @@
 (module lang-api mzscheme
   (require "private/abort-resume.ss"
-           "private/persistent-web-interaction.ss")
-  (provide (all-from "private/abort-resume.ss")
-           (all-from-except mzscheme #%module-begin)
-           (all-from "private/persistent-web-interaction.ss")))
\ No newline at end of file
+           "private/persistent-web-interaction.ss"
+           "lang-api/web-cells.ss"
+           "lang-api/web-param.ss"
+           "lang-api/file-box.ss")
+  (provide (all-from-except mzscheme #%module-begin)
+           (all-from "private/abort-resume.ss")
+           (all-from "private/persistent-web-interaction.ss")
+           (all-from "lang-api/web-cells.ss")
+           (all-from "lang-api/web-param.ss")
+           (all-from "lang-api/file-box.ss")))
\ No newline at end of file
diff --git a/collects/web-server/prototype-web-server/lang-api/web-cells.ss b/collects/web-server/prototype-web-server/lang-api/web-cells.ss
index f10e609aff..401d26bd10 100644
--- a/collects/web-server/prototype-web-server/lang-api/web-cells.ss
+++ b/collects/web-server/prototype-web-server/lang-api/web-cells.ss
@@ -1,9 +1,9 @@
 (module web-cells mzscheme
-  (require "../private/closure.ss"
-           (lib "serialize.ss")
+  (require (lib "serialize.ss")
            (lib "list.ss")
            (lib "plt-match.ss")
-           (lib "contract.ss"))
+           (lib "contract.ss")
+           "../private/closure.ss")
   ;; Implementation: Have a distinguished frame variable that is read and captured by send/suspend, 
   ;; installed on invocations of continuations by the server (and NOT from other continuation invocations)
   
@@ -77,10 +77,8 @@
       (env-replace (primitive-wc-id wc) nv
                    (frame-env (current-frame))))))
   
-  (provide make-web-cell
-           make-web-cell*)
+  (provide make-web-cell)
   (provide/contract
-   #;[make-web-cell* (symbol? any/c . -> . web-cell?)]
    [web-cell? (any/c . -> . boolean?)]
    [web-cell-ref (web-cell? . -> . any/c)]
-   [web-cell-mask (web-cell? any/c . -> . void)]))
+   [web-cell-mask (web-cell? any/c . -> . void)]))
\ No newline at end of file
diff --git a/collects/web-server/prototype-web-server/lang-api/web-param.ss b/collects/web-server/prototype-web-server/lang-api/web-param.ss
index 7adb70721e..09edf5ef86 100644
--- a/collects/web-server/prototype-web-server/lang-api/web-param.ss
+++ b/collects/web-server/prototype-web-server/lang-api/web-param.ss
@@ -2,7 +2,6 @@
   (require "../private/closure.ss"
            (lib "list.ss"))
   (provide make-web-parameter
-           next-web-parameter-id
            web-parameter?
            web-parameterize)
   
diff --git a/collects/web-server/prototype-web-server/servlets/wc-comp.ss b/collects/web-server/prototype-web-server/servlets/wc-comp.ss
index 8f52a012ea..06a6fdb6b8 100644
--- a/collects/web-server/prototype-web-server/servlets/wc-comp.ss
+++ b/collects/web-server/prototype-web-server/servlets/wc-comp.ss
@@ -1,6 +1,5 @@
 (module wc-comp (lib "lang.ss" "web-server" "prototype-web-server")
-  (require (lib "web-cells.ss" "web-server" "prototype-web-server" "lang-api")
-           (lib "web-cell-component.ss" "web-server" "prototype-web-server" "lang-api")
+  (require (lib "web-cell-component.ss" "web-server" "prototype-web-server" "lang-api")
            (lib "url.ss" "net"))
   (provide start)
   
diff --git a/collects/web-server/prototype-web-server/servlets/wc.ss b/collects/web-server/prototype-web-server/servlets/wc.ss
index 8b392dd0d5..1e02bd49ae 100644
--- a/collects/web-server/prototype-web-server/servlets/wc.ss
+++ b/collects/web-server/prototype-web-server/servlets/wc.ss
@@ -1,6 +1,5 @@
 (module wc (lib "lang.ss" "web-server" "prototype-web-server")
-  (require (lib "web-cells.ss" "web-server" "prototype-web-server" "lang-api")
-           (lib "url.ss" "net"))
+  (require (lib "url.ss" "net"))
   (provide start)
   
   (define (start initial-request)