diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/abbrev.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/abbrev.rkt
index d18d9e2f..e7d4f662 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/abbrev.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/abbrev.rkt
@@ -17,13 +17,21 @@
          ;; Using this form so all-from-out works
          "base-abbrev.rkt" "match-expanders.rkt"
 
-         ;; for base type contracts
-         (for-template racket/base racket/contract/base
-                       racket/tcp racket/flonum racket/udp '#%place)
-         ;; for base type predicates
-         racket/pretty racket/udp
-         racket/tcp racket/flonum
-         '#%place) ;; avoid the other dependencies of `racket/place`
+         ;; for base type contracts and predicates
+         ;; use '#%place to avoid the other dependencies of `racket/place`
+         (for-template
+           racket/base
+           racket/contract/base
+           (only-in racket/pretty pretty-print-style-table?)
+           (only-in racket/udp udp?)
+           (only-in racket/tcp tcp-listener?)
+           (only-in racket/flonum flvector?)
+           (only-in '#%place place? place-channel?))
+         (only-in racket/pretty pretty-print-style-table?)
+         (only-in racket/udp udp?)
+         (only-in racket/tcp tcp-listener?)
+         (only-in racket/flonum flvector?)
+         (only-in '#%place place? place-channel?))
 
 (provide (except-out (all-defined-out) make-Base)
          (all-from-out "base-abbrev.rkt" "match-expanders.rkt"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/base-abbrev.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/base-abbrev.rkt
index 25811532..a8eeec4a 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/base-abbrev.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/base-abbrev.rkt
@@ -10,6 +10,7 @@
          (env mvar-env)
          racket/match racket/list (prefix-in c: (contract-req))
          (for-syntax racket/base syntax/parse racket/list)
+         ;; For contract predicates
          (for-template racket/base))
 
 (provide (all-defined-out)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/numeric-tower.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/numeric-tower.rkt
index b05b654d..4072657e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/numeric-tower.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/numeric-tower.rkt
@@ -5,6 +5,7 @@
                     [simple-Un *Un])
          (rename-in (rep type-rep) [make-Base make-Base*])
          unstable/function
+         ;; For base type contracts
          (for-template racket/base racket/contract/base (types numeric-predicates)))
 
 (provide portable-fixnum? portable-index?
diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/struct-table.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/struct-table.rkt
index 5c08223f..4212fff7 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/struct-table.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/struct-table.rkt
@@ -6,13 +6,7 @@
          (prefix-in c: (contract-req))
          (rep type-rep filter-rep object-rep)
          (utils tc-utils)
-         (env init-envs)
-         (for-template 
-          racket/base          
-          (rep type-rep object-rep)
-          (types utils union)
-          (env init-envs)
-          (utils tc-utils)))
+         (env init-envs))
 
 (define struct-fn-table (make-free-id-table))
 (define struct-constructor-table (make-free-id-table))