diff --git a/collects/macro-debugger/model/deriv-util.rkt b/collects/macro-debugger/model/deriv-util.rkt
index 8987afb..d68afcc 100644
--- a/collects/macro-debugger/model/deriv-util.rkt
+++ b/collects/macro-debugger/model/deriv-util.rkt
@@ -1,7 +1,5 @@
 #lang racket/base
 (require (for-syntax racket/base)
-         (for-syntax racket/private/struct-info)
-         racket/list
          racket/match
          unstable/struct
          "deriv.rkt")
diff --git a/collects/macro-debugger/model/deriv.rkt b/collects/macro-debugger/model/deriv.rkt
index 420d6ca..9f397d3 100644
--- a/collects/macro-debugger/model/deriv.rkt
+++ b/collects/macro-debugger/model/deriv.rkt
@@ -1,5 +1,3 @@
 #lang racket/base
-(require racket/contract
-         syntax/stx
-         "deriv-c.rkt")
+(require "deriv-c.rkt")
 (provide (all-from-out "deriv-c.rkt"))
diff --git a/collects/macro-debugger/model/hiding-policies.rkt b/collects/macro-debugger/model/hiding-policies.rkt
index f7476b8..3f0f01b 100644
--- a/collects/macro-debugger/model/hiding-policies.rkt
+++ b/collects/macro-debugger/model/hiding-policies.rkt
@@ -1,6 +1,5 @@
 #lang racket/base
-(require (for-syntax racket/base)
-         racket/match
+(require racket/match
          "reductions-config.rkt"
          "../util/mpi.rkt")
 (provide policy->predicate)
diff --git a/collects/macro-debugger/model/reductions-config.rkt b/collects/macro-debugger/model/reductions-config.rkt
index 448ad22..f1c7848 100644
--- a/collects/macro-debugger/model/reductions-config.rkt
+++ b/collects/macro-debugger/model/reductions-config.rkt
@@ -1,9 +1,7 @@
 #lang racket/base
 (require (for-syntax racket/base)
-         racket/list
          racket/contract
          racket/match
-         "deriv.rkt"
          "deriv-util.rkt"
          "stx-util.rkt"
          "context.rkt"
diff --git a/collects/macro-debugger/model/reductions-engine.rkt b/collects/macro-debugger/model/reductions-engine.rkt
index afdd9cf..125b1db 100644
--- a/collects/macro-debugger/model/reductions-engine.rkt
+++ b/collects/macro-debugger/model/reductions-engine.rkt
@@ -2,9 +2,7 @@
 (require (for-syntax racket/base
                      syntax/parse
                      syntax/parse/experimental/contract)
-         racket/list
          racket/contract
-         "deriv.rkt"
          "deriv-util.rkt"
          "stx-util.rkt"
          "context.rkt"
diff --git a/collects/macro-debugger/model/steps.rkt b/collects/macro-debugger/model/steps.rkt
index e27789b..716277f 100644
--- a/collects/macro-debugger/model/steps.rkt
+++ b/collects/macro-debugger/model/steps.rkt
@@ -1,6 +1,4 @@
 #lang racket/base
-(require "deriv.rkt"
-         "deriv-util.rkt")
 (provide (struct-out protostep)
          (struct-out step)
          (struct-out misstep)
diff --git a/collects/macro-debugger/model/trace-raw.rkt b/collects/macro-debugger/model/trace-raw.rkt
index 3e93222..5a171f7 100644
--- a/collects/macro-debugger/model/trace-raw.rkt
+++ b/collects/macro-debugger/model/trace-raw.rkt
@@ -2,7 +2,6 @@
 (require racket/class
          parser-tools/lex
          "deriv-tokens.rkt"
-         "deriv-parser.rkt"
          "../syntax-browser.rkt")
 (provide (all-defined-out))
 
diff --git a/collects/macro-debugger/model/trace.rkt b/collects/macro-debugger/model/trace.rkt
index 64b84d5..45f41fd 100644
--- a/collects/macro-debugger/model/trace.rkt
+++ b/collects/macro-debugger/model/trace.rkt
@@ -1,7 +1,6 @@
 #lang racket/base
 (require racket/promise
          parser-tools/lex
-         "deriv.rkt"
          "deriv-parser.rkt"
          "deriv-tokens.rkt")
 
diff --git a/collects/macro-debugger/stepper-text.rkt b/collects/macro-debugger/stepper-text.rkt
index 15df8ef..5004438 100644
--- a/collects/macro-debugger/stepper-text.rkt
+++ b/collects/macro-debugger/stepper-text.rkt
@@ -1,6 +1,5 @@
 #lang racket/base
-(require racket/list
-         racket/pretty
+(require racket/pretty
          "model/trace.rkt"
          "model/reductions.rkt"
          "model/reductions-config.rkt"
diff --git a/collects/macro-debugger/syntax-browser/display.rkt b/collects/macro-debugger/syntax-browser/display.rkt
index bc3b1ff..9a242f7 100644
--- a/collects/macro-debugger/syntax-browser/display.rkt
+++ b/collects/macro-debugger/syntax-browser/display.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require racket/class
-         racket/gui
+         racket/gui/base
          racket/list
          racket/block
          framework
diff --git a/collects/macro-debugger/syntax-browser/frame.rkt b/collects/macro-debugger/syntax-browser/frame.rkt
index d59f2eb..2286124 100644
--- a/collects/macro-debugger/syntax-browser/frame.rkt
+++ b/collects/macro-debugger/syntax-browser/frame.rkt
@@ -1,8 +1,7 @@
 #lang racket/base
 (require racket/class
-         racket/gui
+         racket/gui/base
          racket/list
-         framework
          unstable/class-iop
          "interfaces.rkt"
          "partition.rkt"
diff --git a/collects/macro-debugger/syntax-browser/hrule-snip.rkt b/collects/macro-debugger/syntax-browser/hrule-snip.rkt
index c7bb859..a48d135 100644
--- a/collects/macro-debugger/syntax-browser/hrule-snip.rkt
+++ b/collects/macro-debugger/syntax-browser/hrule-snip.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require racket/class
-         racket/gui)
+         racket/gui/base)
 (provide hrule-snip%)
 
 ;; hrule-snip%
diff --git a/collects/macro-debugger/syntax-browser/image.rkt b/collects/macro-debugger/syntax-browser/image.rkt
index 23fa15c..1ecf6f7 100644
--- a/collects/macro-debugger/syntax-browser/image.rkt
+++ b/collects/macro-debugger/syntax-browser/image.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/contract
          racket/class
-         racket/gui
+         racket/gui/base
          framework
          "prefs.rkt"
          "controller.rkt"
diff --git a/collects/macro-debugger/syntax-browser/keymap.rkt b/collects/macro-debugger/syntax-browser/keymap.rkt
index afc3fc2..6544f7d 100644
--- a/collects/macro-debugger/syntax-browser/keymap.rkt
+++ b/collects/macro-debugger/syntax-browser/keymap.rkt
@@ -1,10 +1,9 @@
 #lang racket/base
 (require racket/class
-         racket/gui
+         racket/gui/base
          racket/pretty
          unstable/gui/notify
-         "interfaces.rkt"
-         "partition.rkt")
+         "interfaces.rkt")
 (provide syntax-keymap%)
 
 (define keymap/popup%
diff --git a/collects/macro-debugger/syntax-browser/partition.rkt b/collects/macro-debugger/syntax-browser/partition.rkt
index 35f662d..b2a7367 100644
--- a/collects/macro-debugger/syntax-browser/partition.rkt
+++ b/collects/macro-debugger/syntax-browser/partition.rkt
@@ -1,6 +1,5 @@
 #lang racket/base
 (require racket/class
-         syntax/stx
          "interfaces.rkt"
          "../util/stxobj.rkt")
 (provide new-bound-partition
diff --git a/collects/macro-debugger/syntax-browser/pretty-helper.rkt b/collects/macro-debugger/syntax-browser/pretty-helper.rkt
index 1f58acf..a67ebc2 100644
--- a/collects/macro-debugger/syntax-browser/pretty-helper.rkt
+++ b/collects/macro-debugger/syntax-browser/pretty-helper.rkt
@@ -1,6 +1,5 @@
 #lang racket/base
-(require racket/class
-         racket/pretty
+(require racket/pretty
          unstable/class-iop
          syntax/stx
          unstable/struct
diff --git a/collects/macro-debugger/syntax-browser/pretty-printer.rkt b/collects/macro-debugger/syntax-browser/pretty-printer.rkt
index 442115c..3f0b454 100644
--- a/collects/macro-debugger/syntax-browser/pretty-printer.rkt
+++ b/collects/macro-debugger/syntax-browser/pretty-printer.rkt
@@ -2,7 +2,8 @@
 (require racket/list
          racket/class
          racket/pretty
-         racket/gui
+         racket/gui/base
+         racket/promise
          "pretty-helper.rkt"
          "interfaces.rkt")
 (provide pretty-print-syntax)
diff --git a/collects/macro-debugger/syntax-browser/properties.rkt b/collects/macro-debugger/syntax-browser/properties.rkt
index e4705fa..3773a2c 100644
--- a/collects/macro-debugger/syntax-browser/properties.rkt
+++ b/collects/macro-debugger/syntax-browser/properties.rkt
@@ -1,10 +1,9 @@
 #lang racket/base
 (require racket/class
-         racket/gui
+         racket/gui/base
          framework
          unstable/class-iop
          "interfaces.rkt"
-         "util.rkt"
          "../util/mpi.rkt"
          "../util/stxobj.rkt")
 (provide properties-view%
diff --git a/collects/macro-debugger/syntax-browser/snip-decorated.rkt b/collects/macro-debugger/syntax-browser/snip-decorated.rkt
index c408255..87f2db1 100644
--- a/collects/macro-debugger/syntax-browser/snip-decorated.rkt
+++ b/collects/macro-debugger/syntax-browser/snip-decorated.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require racket/class
-         racket/gui
+         racket/gui/base
          (only-in mzlib/string read-from-string)
          unstable/class-iop
          "interfaces.rkt"
diff --git a/collects/macro-debugger/syntax-browser/snip.rkt b/collects/macro-debugger/syntax-browser/snip.rkt
index 545b213..1b6a8f1 100644
--- a/collects/macro-debugger/syntax-browser/snip.rkt
+++ b/collects/macro-debugger/syntax-browser/snip.rkt
@@ -1,10 +1,9 @@
 #lang racket/base
 (require racket/class
-         racket/gui
+         racket/gui/base
          racket/match
          (only-in mzlib/string read-from-string)
          framework
-         "interfaces.rkt"
          "display.rkt"
          "controller.rkt"
          "keymap.rkt"
diff --git a/collects/macro-debugger/syntax-browser/text.rkt b/collects/macro-debugger/syntax-browser/text.rkt
index d96a4a2..8cbcf9c 100644
--- a/collects/macro-debugger/syntax-browser/text.rkt
+++ b/collects/macro-debugger/syntax-browser/text.rkt
@@ -1,11 +1,10 @@
 #lang racket/base
 (require racket/list
          racket/class
-         racket/gui
+         racket/gui/base
          drracket/arrow
          framework/framework
          data/interval-map
-         unstable/gui/notify
          "interfaces.rkt")
 
 (provide text:hover<%>
diff --git a/collects/macro-debugger/syntax-browser/widget.rkt b/collects/macro-debugger/syntax-browser/widget.rkt
index 5aaccbc..f8292fe 100644
--- a/collects/macro-debugger/syntax-browser/widget.rkt
+++ b/collects/macro-debugger/syntax-browser/widget.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require racket/class
-         racket/gui
+         racket/gui/base
          racket/list
          racket/match
          framework
diff --git a/collects/macro-debugger/view/debug.rkt b/collects/macro-debugger/view/debug.rkt
index 8ebc9da..6ab15a8 100644
--- a/collects/macro-debugger/view/debug.rkt
+++ b/collects/macro-debugger/view/debug.rkt
@@ -4,7 +4,6 @@
          unstable/class-iop
          "interfaces.rkt"
          "debug-format.rkt"
-         "prefs.rkt"
          "view.rkt")
 (provide debug-file)
 
diff --git a/collects/macro-debugger/view/extensions.rkt b/collects/macro-debugger/view/extensions.rkt
index 61425dc..e397339 100644
--- a/collects/macro-debugger/view/extensions.rkt
+++ b/collects/macro-debugger/view/extensions.rkt
@@ -3,21 +3,11 @@
          racket/unit
          racket/list
          racket/match
-         racket/gui
-         framework
+         racket/gui/base
          unstable/class-iop
          "interfaces.rkt"
-         "prefs.rkt"
-         "hiding-panel.rkt"
          (prefix-in s: "../syntax-browser/widget.rkt")
-         (prefix-in s: "../syntax-browser/keymap.rkt")
-         (prefix-in s: "../syntax-browser/interfaces.rkt")
-         "../model/deriv.rkt"
-         "../model/deriv-util.rkt"
-         "../model/trace.rkt"
-         "../model/steps.rkt"
-         "cursor.rkt"
-         unstable/gui/notify)
+         (prefix-in s: "../syntax-browser/keymap.rkt"))
 (provide stepper-keymap%
          stepper-syntax-widget%)
 
diff --git a/collects/macro-debugger/view/frame.rkt b/collects/macro-debugger/view/frame.rkt
index 3d02a47..81001b9 100644
--- a/collects/macro-debugger/view/frame.rkt
+++ b/collects/macro-debugger/view/frame.rkt
@@ -3,21 +3,15 @@
          racket/unit
          racket/list
          racket/file
+         racket/path
          racket/match
-         racket/gui
+         racket/gui/base
          framework
          unstable/class-iop
          "interfaces.rkt"
          "stepper.rkt"
-         "prefs.rkt"
-         "hiding-panel.rkt"
          (prefix-in sb: "../syntax-browser/embed.rkt")
 	 (prefix-in sb: "../syntax-browser/interfaces.rkt")
-         "../model/deriv.rkt"
-         "../model/deriv-util.rkt"
-         "../model/trace.rkt"
-         "../model/steps.rkt"
-         "cursor.rkt"
          unstable/gui/notify)
 (provide macro-stepper-frame-mixin)
 
diff --git a/collects/macro-debugger/view/hiding-panel.rkt b/collects/macro-debugger/view/hiding-panel.rkt
index 61d7f42..5442459 100644
--- a/collects/macro-debugger/view/hiding-panel.rkt
+++ b/collects/macro-debugger/view/hiding-panel.rkt
@@ -1,7 +1,8 @@
 #lang racket/base
 (require racket/class
-         racket/gui
+         racket/gui/base
          racket/list
+         racket/match
          unstable/class-iop
          "interfaces.rkt"
          "../model/hiding-policies.rkt"
diff --git a/collects/macro-debugger/view/step-display.rkt b/collects/macro-debugger/view/step-display.rkt
index 0e01ccf..471632f 100644
--- a/collects/macro-debugger/view/step-display.rkt
+++ b/collects/macro-debugger/view/step-display.rkt
@@ -3,23 +3,11 @@
          racket/unit
          racket/list
          racket/match
-         racket/gui
-         framework
+         racket/gui/base
          unstable/class-iop
          "interfaces.rkt"
-         "prefs.rkt"
-         "extensions.rkt"
-         "hiding-panel.rkt"
-         "../model/deriv.rkt"
-         "../model/deriv-util.rkt"
-         "../model/deriv-parser.rkt"
-         "../model/trace.rkt"
-         "../model/reductions-config.rkt"
-         "../model/reductions.rkt"
          "../model/steps.rkt"
-         unstable/gui/notify
 	 (prefix-in sb: "../syntax-browser/interfaces.rkt")
-         "cursor.rkt"
          "debug-format.rkt")
 
 #;
diff --git a/collects/macro-debugger/view/stepper.rkt b/collects/macro-debugger/view/stepper.rkt
index bba35c7..96570e7 100644
--- a/collects/macro-debugger/view/stepper.rkt
+++ b/collects/macro-debugger/view/stepper.rkt
@@ -3,11 +3,9 @@
          racket/unit
          racket/list
          racket/match
-         racket/gui
-         framework
+         racket/gui/base
          unstable/class-iop
          "interfaces.rkt"
-         "prefs.rkt"
          "extensions.rkt"
          "hiding-panel.rkt"
          "term-record.rkt"
@@ -15,9 +13,6 @@
 	 (prefix-in sb: "../syntax-browser/interfaces.rkt")
          "../model/deriv.rkt"
          "../model/deriv-util.rkt"
-         "../model/trace.rkt"
-         "../model/reductions.rkt"
-         "../model/steps.rkt"
          "cursor.rkt"
          unstable/gui/notify
          (only-in mzscheme [#%top-interaction mz-top-interaction]))
diff --git a/collects/macro-debugger/view/term-record.rkt b/collects/macro-debugger/view/term-record.rkt
index 44d7a9c..03339d5 100644
--- a/collects/macro-debugger/view/term-record.rkt
+++ b/collects/macro-debugger/view/term-record.rkt
@@ -3,15 +3,11 @@
          racket/unit
          racket/list
          racket/match
-         racket/gui
-         framework
+         racket/gui/base
          syntax/stx
          unstable/find
          unstable/class-iop
          "interfaces.rkt"
-         "prefs.rkt"
-         "extensions.rkt"
-         "hiding-panel.rkt"
          "step-display.rkt"
          "../model/deriv.rkt"
          "../model/deriv-util.rkt"
@@ -20,9 +16,7 @@
          "../model/reductions-config.rkt"
          "../model/reductions.rkt"
          "../model/steps.rkt"
-         unstable/gui/notify
-         "cursor.rkt"
-         "debug-format.rkt")
+         "cursor.rkt")
 
 (provide term-record%)
 
diff --git a/collects/macro-debugger/view/view.rkt b/collects/macro-debugger/view/view.rkt
index 4552b48..a4462b7 100644
--- a/collects/macro-debugger/view/view.rkt
+++ b/collects/macro-debugger/view/view.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/class
          racket/pretty
-         racket/gui
+         racket/gui/base
          framework
          unstable/class-iop
          "interfaces.rkt"