diff --git a/collects/macro-debugger/model/deriv-util.rkt b/collects/macro-debugger/model/deriv-util.rkt
index 8987afb8fb..d68afccc0b 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 420d6cae71..9f397d305b 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 f7476b8637..3f0f01b1f7 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 448ad2212b..f1c7848715 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 afdd9cf3fd..125b1dbe14 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 e27789b0f2..716277fc6b 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 3e932226d1..5a171f7049 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 64b84d52fc..45f41fd8c3 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 15df8ef508..5004438812 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 bc3b1fff2c..9a242f791f 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 d59f2eb658..2286124c69 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 c7bb859ed5..a48d13547e 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 23fa15c258..1ecf6f788f 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 afc3fc2d33..6544f7d902 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 35f662d0c3..b2a73677e6 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 1f58acf6d5..a67ebc2c26 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 442115cdb1..3f0b4547ad 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 e4705fab4b..3773a2c948 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 c408255338..87f2db1cf9 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 545b2134ec..1b6a8f1a5b 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 d96a4a2829..8cbcf9c8db 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 5aaccbc132..f8292fe276 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/tool.rkt b/collects/macro-debugger/tool.rkt
index 4775e493e1..7e07fa7860 100644
--- a/collects/macro-debugger/tool.rkt
+++ b/collects/macro-debugger/tool.rkt
@@ -2,14 +2,13 @@
 (require racket/list
          racket/unit
          racket/match
-         racket/gui
+         racket/gui/base
+         racket/class
          framework
          drscheme/tool
          mrlib/switchable-button
          string-constants
          "model/trace.rkt"
-         "model/deriv.rkt"
-         "model/deriv-util.rkt"
          "view/frame.rkt"
          (only-in "view/view.rkt" macro-stepper-director%)
          "view/stepper.rkt"
diff --git a/collects/macro-debugger/view/debug.rkt b/collects/macro-debugger/view/debug.rkt
index 8ebc9da6ab..6ab15a8762 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 61425dcba1..e397339a8f 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 3d02a47e73..81001b9c0d 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 61d7f4279c..54424590a3 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 0e01ccf10a..471632f1a7 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 bba35c77f1..96570e765f 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 44d7a9c8a0..03339d54cb 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 4552b48bb9..a4462b7773 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"
diff --git a/collects/rackunit/private/gui/gui.rkt b/collects/rackunit/private/gui/gui.rkt
index 61050b2514..2904ac8c90 100644
--- a/collects/rackunit/private/gui/gui.rkt
+++ b/collects/rackunit/private/gui/gui.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/class
          unstable/class-iop
-         racket/gui
+         racket/gui/base
          "../base.rkt"
          "../result.rkt"
          "../check-info.rkt"
diff --git a/collects/rackunit/private/gui/model2rml.rkt b/collects/rackunit/private/gui/model2rml.rkt
index fb10840a08..f874cf3f7e 100644
--- a/collects/rackunit/private/gui/model2rml.rkt
+++ b/collects/rackunit/private/gui/model2rml.rkt
@@ -2,9 +2,10 @@
 (require racket/class
          unstable/class-iop
          racket/list
-         racket/gui
+         racket/gui/base
          racket/match
          racket/file
+         racket/path
          mrlib/include-bitmap
          (prefix-in drlink: "drracket-ui.rkt")
          "interfaces.rkt"
diff --git a/collects/rackunit/private/gui/rml.rkt b/collects/rackunit/private/gui/rml.rkt
index 596f028864..eea40bfde8 100644
--- a/collects/rackunit/private/gui/rml.rkt
+++ b/collects/rackunit/private/gui/rml.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/class
          unstable/class-iop
-         racket/gui
+         racket/gui/base
          framework
          "interfaces.rkt")
 
diff --git a/collects/rackunit/private/gui/view.rkt b/collects/rackunit/private/gui/view.rkt
index 0372b9926c..79315f597f 100644
--- a/collects/rackunit/private/gui/view.rkt
+++ b/collects/rackunit/private/gui/view.rkt
@@ -3,7 +3,7 @@
          unstable/class-iop
          unstable/gui/notify
          racket/list
-         racket/gui
+         racket/gui/base
          framework
          mrlib/hierlist
          "interfaces.rkt"
diff --git a/collects/rackunit/tool.rkt b/collects/rackunit/tool.rkt
index 20bfd5ecac..ba75e1a362 100644
--- a/collects/rackunit/tool.rkt
+++ b/collects/rackunit/tool.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require racket/class
-         racket/gui
+         racket/gui/base
          framework
          drscheme/tool
          racket/unit
diff --git a/collects/syntax/parse/private/rep-attrs.rkt b/collects/syntax/parse/private/rep-attrs.rkt
index 00a6b29d5d..634f62c7e6 100644
--- a/collects/syntax/parse/private/rep-attrs.rkt
+++ b/collects/syntax/parse/private/rep-attrs.rkt
@@ -1,6 +1,5 @@
 #lang racket/base
 (require racket/contract/base
-         syntax/stx
          syntax/id-table
          unstable/syntax
          unstable/struct)
diff --git a/collects/syntax/parse/private/runtime-report.rkt b/collects/syntax/parse/private/runtime-report.rkt
index b1adac8354..db567b1897 100644
--- a/collects/syntax/parse/private/runtime-report.rkt
+++ b/collects/syntax/parse/private/runtime-report.rkt
@@ -1,13 +1,6 @@
 #lang racket/base
-(require racket/contract/base
-         racket/list
+(require racket/list
          "minimatch.rkt"
-         racket/stxparam
-         syntax/stx
-         (for-syntax racket/base
-                     syntax/stx
-                     racket/private/sc
-                     "rep-data.rkt")
          "runtime.rkt"
          "kws.rkt")
 (provide syntax-patterns-fail
diff --git a/collects/unstable/gui/notify.rkt b/collects/unstable/gui/notify.rkt
index 368ea8d445..ff6f01d64a 100644
--- a/collects/unstable/gui/notify.rkt
+++ b/collects/unstable/gui/notify.rkt
@@ -2,7 +2,7 @@
 ;; owner: ryanc
 (require racket/list
          racket/class
-         racket/gui
+         racket/gui/base
          "../private/notify.rkt")
 (provide (all-from-out "../private/notify.rkt")
          menu-option/notify-box