diff --git a/collects/typed-scheme/typecheck/check-subforms-unit.ss b/collects/typed-scheme/typecheck/check-subforms-unit.ss
index 3dd9208d83..3e93d5eaa3 100644
--- a/collects/typed-scheme/typecheck/check-subforms-unit.ss
+++ b/collects/typed-scheme/typecheck/check-subforms-unit.ss
@@ -4,7 +4,7 @@
 (require syntax/kerncase
          scheme/match
          "signatures.ss"
-         (private type-utils type-effect-convenience union subtype)
+         (types utils convenience union subtype)
 	 (utils tc-utils)
 	 (rep type-rep))
 
@@ -18,7 +18,7 @@
   (define body-ty #f)    
   (define (get-result-ty t)
     (match t
-      [(Function: (list (arr: _ rngs #f _ '() _ _) ...)) (apply Un rngs)]
+      [(Function: (list (arr: _ (Values: (list (Result: rngs _ _))) #f _ '()) ...)) (apply Un rngs)]
       [_ (tc-error "Internal error in get-result-ty: not a function type: ~n~a" t)]))
   (let loop ([form form])
     (parameterize ([current-orig-stx form])
diff --git a/collects/typed-scheme/typecheck/defstruct-unit.ss b/collects/typed-scheme/typecheck/defstruct-unit.ss
deleted file mode 100644
index 3fed9fb241..0000000000
--- a/collects/typed-scheme/typecheck/defstruct-unit.ss
+++ /dev/null
@@ -1,21 +0,0 @@
-#lang scheme/base
-(require mzlib/struct mzlib/unit)
-(provide #;(all-defined))
-
-(define-syntax defstructs/sig/unit
-  (syntax-rules (define-struct/properties)
-    [(_ signame unitname (imps ...)
-        def
-        (define-struct/properties nm1 (flds1 ...) props #f)
-        (define-struct/properties (nm par) (flds ...) () #f) ...)
-     (begin
-       (define-signature signame
-         ((struct nm1 (flds1 ...))
-          (struct nm (flds ...)) ...))
-       (define-unit unitname           
-         (import imps ...)
-         (export signame)
-         def
-         (define-struct/properties nm1 (flds1 ...) props #f)
-         (define-struct (nm par) (flds ...) #f) ...))]))
-
diff --git a/collects/typed-scheme/typecheck/tc-dots-unit.ss b/collects/typed-scheme/typecheck/tc-dots-unit.ss
index 2aa1b38220..eb5e9c2f3a 100644
--- a/collects/typed-scheme/typecheck/tc-dots-unit.ss
+++ b/collects/typed-scheme/typecheck/tc-dots-unit.ss
@@ -4,7 +4,7 @@
 (require "signatures.ss"
          (utils tc-utils)
          (env type-environments)
-         (private type-utils)
+         (types utils)
          (rep type-rep)
          syntax/kerncase
          scheme/match)
diff --git a/collects/typed-scheme/typecheck/tc-let-unit.ss b/collects/typed-scheme/typecheck/tc-let-unit.ss
index 9bf2bf3fa7..c8a3a1ce10 100644
--- a/collects/typed-scheme/typecheck/tc-let-unit.ss
+++ b/collects/typed-scheme/typecheck/tc-let-unit.ss
@@ -2,7 +2,8 @@
 
 (require (rename-in "../utils/utils.ss" [infer r:infer]))
 (require "signatures.ss"
-         (private type-effect-convenience type-annotation parse-type type-utils)
+         (types utils convenience)
+         (private type-annotation parse-type)
 	 (env lexical-env type-alias-env type-env)
          syntax/free-vars
          mzlib/trace