diff --git a/collects/mzlib/private/contract-arr-obj-helpers.ss b/collects/mzlib/private/contract-arr-obj-helpers.ss index 52d4d6a099..8c4b904c98 100644 --- a/collects/mzlib/private/contract-arr-obj-helpers.ss +++ b/collects/mzlib/private/contract-arr-obj-helpers.ss @@ -1,8 +1,5 @@ (module contract-arr-obj-helpers mzscheme - (require "contract-opt-guts.ss" - "contract-helpers.ss" - (lib "list.ss") - (lib "stx.ss" "syntax") + (require (lib "stx.ss" "syntax") (lib "name.ss" "syntax")) (require-for-template mzscheme diff --git a/collects/mzlib/private/contract-arrow.ss b/collects/mzlib/private/contract-arrow.ss index f805ff1b4a..7dbfeadbe2 100644 --- a/collects/mzlib/private/contract-arrow.ss +++ b/collects/mzlib/private/contract-arrow.ss @@ -1,14 +1,11 @@ (module contract-arrow mzscheme (require (lib "etc.ss") - (lib "list.ss") "contract-guts.ss" "contract-arr-checks.ss" - "contract-opt.ss" - "contract-opt-guts.ss") + "contract-opt.ss") (require-for-syntax "contract-opt-guts.ss" "contract-helpers.ss" "contract-arr-obj-helpers.ss" - (lib "list.ss") (lib "stx.ss" "syntax") (lib "name.ss" "syntax")) diff --git a/collects/mzlib/private/contract-guts.ss b/collects/mzlib/private/contract-guts.ss index 06f774a4cf..62dc738c43 100644 --- a/collects/mzlib/private/contract-guts.ss +++ b/collects/mzlib/private/contract-guts.ss @@ -1,7 +1,6 @@ (module contract-guts mzscheme (require "contract-helpers.ss" - (lib "pretty.ss") - (lib "list.ss")) + (lib "pretty.ss")) (require-for-syntax "contract-helpers.ss") diff --git a/collects/mzlib/private/contract-object.ss b/collects/mzlib/private/contract-object.ss index 62c84bbc7d..4d670d7691 100644 --- a/collects/mzlib/private/contract-object.ss +++ b/collects/mzlib/private/contract-object.ss @@ -1,19 +1,13 @@ (module contract-object mzscheme (require (lib "etc.ss") - (lib "list.ss") "contract-arrow.ss" "contract-guts.ss" - "contract-opt.ss" - "contract-opt-guts.ss" "class-internal.ss" "contract-arr-checks.ss") - (require-for-syntax "contract-opt-guts.ss" - "contract-helpers.ss" + (require-for-syntax "contract-helpers.ss" "contract-arr-obj-helpers.ss" - (lib "list.ss") - (lib "stx.ss" "syntax") - (lib "name.ss" "syntax")) + (lib "list.ss")) (provide mixin-contract make-mixin-contract diff --git a/collects/mzlib/private/contract-opt-guts.ss b/collects/mzlib/private/contract-opt-guts.ss index d20b882177..dd3548593f 100644 --- a/collects/mzlib/private/contract-opt-guts.ss +++ b/collects/mzlib/private/contract-opt-guts.ss @@ -1,7 +1,6 @@ (module contract-opt-guts mzscheme (require (lib "private/boundmap.ss" "syntax") - (lib "list.ss") - "contract-guts.ss") + (lib "list.ss")) (require-for-template mzscheme) (provide get-opter reg-opter! opter diff --git a/collects/mzlib/private/contract.ss b/collects/mzlib/private/contract.ss index 39dcb1b9a1..a7a24830af 100644 --- a/collects/mzlib/private/contract.ss +++ b/collects/mzlib/private/contract.ss @@ -15,17 +15,11 @@ improve method arity mismatch contract violation error messages? (require-for-syntax mzscheme "contract-opt-guts.ss" (lib "list.ss") - (lib "stx.ss" "syntax") - (lib "etc.ss") - (lib "name.ss" "syntax")) + (lib "etc.ss")) - (require (lib "etc.ss") - (lib "list.ss") - (lib "pretty.ss") - "contract-arrow.ss" + (require "contract-arrow.ss" "contract-guts.ss" - "contract-opt.ss" - "contract-opt-guts.ss") + "contract-opt.ss") (require "contract-helpers.ss") (require-for-syntax (prefix a: "contract-helpers.ss"))