diff --git a/collects/web-server/servlet.ss b/collects/web-server/servlet.ss
index 9f1b062514..5c65ad19eb 100644
--- a/collects/web-server/servlet.ss
+++ b/collects/web-server/servlet.ss
@@ -7,12 +7,20 @@
            "private/url.ss"
            "servlet/helpers.ss"
            "servlet/web-cells.ss"
-           "servlet-structs.ss")  
-  (require "servlet/servlet-url.ss")
+           "servlet/bindings.ss"
+           "servlet/basic-auth.ss"
+           "servlet/servlet-url.ss"
+           "response-structs.ss"
+           "request-structs.ss"
+           "servlet-structs.ss")
   (provide (all-from "servlet/web-cells.ss")
            (all-from "servlet/helpers.ss")
            (all-from "servlet/servlet-url.ss")
-           (all-from "servlet-structs.ss"))
+           (all-from "servlet-structs.ss")
+           (all-from "servlet/bindings.ss")
+           (all-from "servlet/basic-auth.ss")
+           (all-from "response-structs.ss")
+           (all-from "request-structs.ss"))
   
   ;; ************************************************************
   ;; HELPERS
diff --git a/collects/web-server/servlet/helpers.ss b/collects/web-server/servlet/helpers.ss
index 87a3fc03fa..bd3bc7b30e 100644
--- a/collects/web-server/servlet/helpers.ss
+++ b/collects/web-server/servlet/helpers.ss
@@ -4,14 +4,8 @@
            (lib "plt-match.ss")
            (lib "uri-codec.ss" "net"))
   (require "../private/util.ss"
-           "bindings.ss"
-           "basic-auth.ss"
            "../request-structs.ss"
            "../response-structs.ss")
-  (provide (all-from "bindings.ss")
-           (all-from "basic-auth.ss")
-           (all-from "../response-structs.ss")
-           (all-from "../request-structs.ss"))
   
   (define (request-headers request)
     (map (match-lambda