diff --git a/collects/macro-debugger/analysis/check-requires.rkt b/collects/macro-debugger/analysis/check-requires.rkt
index 8041ab1..7c53641 100644
--- a/collects/macro-debugger/analysis/check-requires.rkt
+++ b/collects/macro-debugger/analysis/check-requires.rkt
@@ -3,7 +3,6 @@
          racket/cmdline
          racket/match
          syntax/modcollapse
-         unstable/struct
          "private/get-references.rkt"
          "private/nom-use-alg.rkt"
          "private/util.rkt")
diff --git a/collects/macro-debugger/analysis/private/moduledb.rkt b/collects/macro-debugger/analysis/private/moduledb.rkt
index 0e4807e..106a1d1 100644
--- a/collects/macro-debugger/analysis/private/moduledb.rkt
+++ b/collects/macro-debugger/analysis/private/moduledb.rkt
@@ -1,7 +1,6 @@
 #lang racket/base
 (require syntax/modresolve
          setup/path-to-relative
-         "util.rkt"
          racket/match)
 (provide allow-bypass?
          allow-drop?
diff --git a/collects/macro-debugger/expand.rkt b/collects/macro-debugger/expand.rkt
index b34cb03..345b8a6 100644
--- a/collects/macro-debugger/expand.rkt
+++ b/collects/macro-debugger/expand.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require racket/contract
+(require racket/contract/base
          "model/trace.rkt"
          "model/reductions-config.rkt"
          "model/reductions.rkt")
diff --git a/collects/macro-debugger/model/reductions-config.rkt b/collects/macro-debugger/model/reductions-config.rkt
index 661e95c..599ff05 100644
--- a/collects/macro-debugger/model/reductions-config.rkt
+++ b/collects/macro-debugger/model/reductions-config.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require (for-syntax racket/base)
-         racket/contract
+         racket/contract/base
          racket/match
          "../util/eomap.rkt"
          "deriv-util.rkt"
diff --git a/collects/macro-debugger/model/reductions-engine.rkt b/collects/macro-debugger/model/reductions-engine.rkt
index 3aec5cd..b80eb25 100644
--- a/collects/macro-debugger/model/reductions-engine.rkt
+++ b/collects/macro-debugger/model/reductions-engine.rkt
@@ -2,7 +2,7 @@
 (require (for-syntax racket/base
                      syntax/parse
                      syntax/parse/experimental/contract)
-         racket/contract
+         racket/contract/base
          syntax/stx
          "deriv-util.rkt"
          "stx-util.rkt"
diff --git a/collects/macro-debugger/stepper.rkt b/collects/macro-debugger/stepper.rkt
index 48982a6..df245f2 100644
--- a/collects/macro-debugger/stepper.rkt
+++ b/collects/macro-debugger/stepper.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require racket/class
-         racket/contract
+         racket/contract/base
          unstable/class-iop
          "model/trace.rkt"
          "view/interfaces.rkt"
diff --git a/collects/macro-debugger/syntax-browser/frame.rkt b/collects/macro-debugger/syntax-browser/frame.rkt
index 2286124..8b5b016 100644
--- a/collects/macro-debugger/syntax-browser/frame.rkt
+++ b/collects/macro-debugger/syntax-browser/frame.rkt
@@ -1,7 +1,6 @@
 #lang racket/base
 (require racket/class
          racket/gui/base
-         racket/list
          unstable/class-iop
          "interfaces.rkt"
          "partition.rkt"
diff --git a/collects/macro-debugger/syntax-browser/image.rkt b/collects/macro-debugger/syntax-browser/image.rkt
index 2a6e4e1..eab4c64 100644
--- a/collects/macro-debugger/syntax-browser/image.rkt
+++ b/collects/macro-debugger/syntax-browser/image.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require racket/contract
+(require racket/contract/base
          racket/class
          racket/gui/base
          framework
diff --git a/collects/macro-debugger/syntax-browser/interfaces.rkt b/collects/macro-debugger/syntax-browser/interfaces.rkt
index 9d04748..53306ea 100644
--- a/collects/macro-debugger/syntax-browser/interfaces.rkt
+++ b/collects/macro-debugger/syntax-browser/interfaces.rkt
@@ -1,6 +1,5 @@
 #lang racket/base
-(require racket/class
-         unstable/class-iop
+(require unstable/class-iop
          (for-syntax racket/base))
 (provide (all-defined-out))
 
diff --git a/collects/macro-debugger/syntax-browser/prefs.rkt b/collects/macro-debugger/syntax-browser/prefs.rkt
index fb4dce2..a392882 100644
--- a/collects/macro-debugger/syntax-browser/prefs.rkt
+++ b/collects/macro-debugger/syntax-browser/prefs.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require racket/class
-         framework
+         framework/preferences
          "interfaces.rkt"
          unstable/gui/notify
          unstable/gui/prefs)
diff --git a/collects/macro-debugger/syntax-browser/pretty-printer.rkt b/collects/macro-debugger/syntax-browser/pretty-printer.rkt
index ae5a835..62e965a 100644
--- a/collects/macro-debugger/syntax-browser/pretty-printer.rkt
+++ b/collects/macro-debugger/syntax-browser/pretty-printer.rkt
@@ -1,6 +1,5 @@
 #lang racket/base
-(require racket/list
-         racket/class
+(require racket/class
          racket/pretty
          racket/gui/base
          racket/promise
diff --git a/collects/macro-debugger/syntax-browser/text.rkt b/collects/macro-debugger/syntax-browser/text.rkt
index 5b30b94..dea286a 100644
--- a/collects/macro-debugger/syntax-browser/text.rkt
+++ b/collects/macro-debugger/syntax-browser/text.rkt
@@ -3,7 +3,7 @@
          racket/gui/base
          data/interval-map
          drracket/arrow
-         framework/framework
+         framework
          data/interval-map
          "interfaces.rkt")
 
diff --git a/collects/macro-debugger/util/eomap.rkt b/collects/macro-debugger/util/eomap.rkt
index 1421385..fd2f69a 100644
--- a/collects/macro-debugger/util/eomap.rkt
+++ b/collects/macro-debugger/util/eomap.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require racket/contract
+(require racket/contract/base
          racket/dict
          racket/match)
 
diff --git a/collects/macro-debugger/util/stxobj.rkt b/collects/macro-debugger/util/stxobj.rkt
index 58d30f2..1650f6e 100644
--- a/collects/macro-debugger/util/stxobj.rkt
+++ b/collects/macro-debugger/util/stxobj.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require (rename-in racket/contract [-> c:->])
+(require (rename-in racket/contract/base [-> c:->])
          ffi/unsafe)
 
 (define lib (ffi-lib #f))
diff --git a/collects/macro-debugger/view/prefs.rkt b/collects/macro-debugger/view/prefs.rkt
index 6c86723..b5ca82f 100644
--- a/collects/macro-debugger/view/prefs.rkt
+++ b/collects/macro-debugger/view/prefs.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require racket/class
-         framework
+         framework/preferences
          "interfaces.rkt"
          "../syntax-browser/prefs.rkt"
          unstable/gui/notify
diff --git a/collects/unstable/find.rkt b/collects/unstable/find.rkt
index 0ca5a23..f7e401e 100644
--- a/collects/unstable/find.rkt
+++ b/collects/unstable/find.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require racket/contract
+(require racket/contract/base
          unstable/struct)
 
 (provide/contract