diff --git a/macro-debugger-text-lib/info.rkt b/macro-debugger-text-lib/info.rkt
index d60961b..43e163a 100644
--- a/macro-debugger-text-lib/info.rkt
+++ b/macro-debugger-text-lib/info.rkt
@@ -2,8 +2,8 @@
 
 (define collection 'multi)
 (define deps '("base"
-               "parser-tools-lib"
-               "unstable-list-lib"))
+               "class-iop-lib"
+               "parser-tools-lib"))
 
 (define pkg-desc "The macro debugger tool with a console interface")
 
diff --git a/macro-debugger-text-lib/macro-debugger/syntax-browser/interfaces.rkt b/macro-debugger-text-lib/macro-debugger/syntax-browser/interfaces.rkt
index 53306ea..0a93d27 100644
--- a/macro-debugger-text-lib/macro-debugger/syntax-browser/interfaces.rkt
+++ b/macro-debugger-text-lib/macro-debugger/syntax-browser/interfaces.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require unstable/class-iop
+(require racket/class/iop
          (for-syntax racket/base))
 (provide (all-defined-out))
 
diff --git a/macro-debugger-text-lib/macro-debugger/syntax-browser/pretty-helper.rkt b/macro-debugger-text-lib/macro-debugger/syntax-browser/pretty-helper.rkt
index 10329ee..dee3dc8 100644
--- a/macro-debugger-text-lib/macro-debugger/syntax-browser/pretty-helper.rkt
+++ b/macro-debugger-text-lib/macro-debugger/syntax-browser/pretty-helper.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require racket/pretty
-         unstable/class-iop
+         racket/class/iop
          unstable/struct
          "interfaces.rkt"
          "../model/stx-util.rkt")
diff --git a/macro-debugger/info.rkt b/macro-debugger/info.rkt
index 1da07c5..a6ecbf0 100644
--- a/macro-debugger/info.rkt
+++ b/macro-debugger/info.rkt
@@ -3,6 +3,7 @@
 (define collection 'multi)
 
 (define deps '("base"
+               "class-iop-lib"
                "compatibility-lib"
                "data-lib"
                "gui-lib"
@@ -10,7 +11,6 @@
                "images-gui-lib"
                "parser-tools-lib"
                "unstable-lib"
-               "unstable-list-lib"
                "macro-debugger-text-lib"))
 (define build-deps '("racket-index"
                      "rackunit-lib"
diff --git a/macro-debugger/macro-debugger/stepper.rkt b/macro-debugger/macro-debugger/stepper.rkt
index bd977b3..2437cd9 100644
--- a/macro-debugger/macro-debugger/stepper.rkt
+++ b/macro-debugger/macro-debugger/stepper.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/class
          racket/contract/base
-         unstable/class-iop
+         racket/class/iop
          macro-debugger/model/trace
          "view/interfaces.rkt"
          "view/view.rkt")
diff --git a/macro-debugger/macro-debugger/syntax-browser/controller.rkt b/macro-debugger/macro-debugger/syntax-browser/controller.rkt
index a9d7a5b..c5314b4 100644
--- a/macro-debugger/macro-debugger/syntax-browser/controller.rkt
+++ b/macro-debugger/macro-debugger/syntax-browser/controller.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 (require racket/class
-         unstable/class-iop
+         racket/class/iop
          macro-debugger/syntax-browser/interfaces
          macro-debugger/syntax-browser/partition
          unstable/gui/notify)
diff --git a/macro-debugger/macro-debugger/syntax-browser/display.rkt b/macro-debugger/macro-debugger/syntax-browser/display.rkt
index 02206bc..2b32f8b 100644
--- a/macro-debugger/macro-debugger/syntax-browser/display.rkt
+++ b/macro-debugger/macro-debugger/syntax-browser/display.rkt
@@ -4,7 +4,7 @@
          racket/promise
          data/interval-map
          framework
-         unstable/class-iop
+         racket/class/iop
          "pretty-printer.rkt"
          macro-debugger/syntax-browser/interfaces
          "prefs.rkt"
diff --git a/macro-debugger/macro-debugger/syntax-browser/frame.rkt b/macro-debugger/macro-debugger/syntax-browser/frame.rkt
index 2447441..28b1af2 100644
--- a/macro-debugger/macro-debugger/syntax-browser/frame.rkt
+++ b/macro-debugger/macro-debugger/syntax-browser/frame.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/class
          racket/gui/base
-         unstable/class-iop
+         racket/class/iop
          macro-debugger/syntax-browser/interfaces
          macro-debugger/syntax-browser/partition
          "prefs.rkt"
diff --git a/macro-debugger/macro-debugger/syntax-browser/properties.rkt b/macro-debugger/macro-debugger/syntax-browser/properties.rkt
index b6d0222..a9a9816 100644
--- a/macro-debugger/macro-debugger/syntax-browser/properties.rkt
+++ b/macro-debugger/macro-debugger/syntax-browser/properties.rkt
@@ -3,7 +3,7 @@
          racket/match
          racket/gui/base
          framework
-         unstable/class-iop
+         racket/class/iop
          macro-debugger/syntax-browser/interfaces
          "util.rkt"
          macro-debugger/util/mpi
diff --git a/macro-debugger/macro-debugger/syntax-browser/snip-decorated.rkt b/macro-debugger/macro-debugger/syntax-browser/snip-decorated.rkt
index 4cbd0bf..17d869b 100644
--- a/macro-debugger/macro-debugger/syntax-browser/snip-decorated.rkt
+++ b/macro-debugger/macro-debugger/syntax-browser/snip-decorated.rkt
@@ -2,7 +2,7 @@
 (require racket/class
          racket/gui/base
          (only-in mzlib/string read-from-string)
-         unstable/class-iop
+         racket/class/iop
          macro-debugger/syntax-browser/interfaces
          "controller.rkt"
          "properties.rkt"
diff --git a/macro-debugger/macro-debugger/syntax-browser/widget.rkt b/macro-debugger/macro-debugger/syntax-browser/widget.rkt
index 09288a1..d16b9ea 100644
--- a/macro-debugger/macro-debugger/syntax-browser/widget.rkt
+++ b/macro-debugger/macro-debugger/syntax-browser/widget.rkt
@@ -4,7 +4,7 @@
          racket/match
          framework
          syntax/id-table
-         unstable/class-iop
+         racket/class/iop
          macro-debugger/syntax-browser/interfaces
          "controller.rkt"
          "display.rkt"
diff --git a/macro-debugger/macro-debugger/view/debug.rkt b/macro-debugger/macro-debugger/view/debug.rkt
index 209c23a..336931a 100644
--- a/macro-debugger/macro-debugger/view/debug.rkt
+++ b/macro-debugger/macro-debugger/view/debug.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/pretty
          racket/class
-         unstable/class-iop
+         racket/class/iop
          "interfaces.rkt"
          macro-debugger/view/debug-format
          "view.rkt")
diff --git a/macro-debugger/macro-debugger/view/extensions.rkt b/macro-debugger/macro-debugger/view/extensions.rkt
index dd88116..71d781e 100644
--- a/macro-debugger/macro-debugger/view/extensions.rkt
+++ b/macro-debugger/macro-debugger/view/extensions.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 (require racket/class
          racket/gui/base
-         unstable/class-iop
+         racket/class/iop
          "interfaces.rkt"
          (prefix-in s: "../syntax-browser/widget.rkt")
          (prefix-in s: "../syntax-browser/keymap.rkt"))
diff --git a/macro-debugger/macro-debugger/view/frame.rkt b/macro-debugger/macro-debugger/view/frame.rkt
index 65eda3c..4af6093 100644
--- a/macro-debugger/macro-debugger/view/frame.rkt
+++ b/macro-debugger/macro-debugger/view/frame.rkt
@@ -3,7 +3,7 @@
          racket/path
          racket/gui/base
          framework
-         unstable/class-iop
+         racket/class/iop
          "interfaces.rkt"
          "stepper.rkt"
          (prefix-in sb: "../syntax-browser/embed.rkt")
diff --git a/macro-debugger/macro-debugger/view/hiding-panel.rkt b/macro-debugger/macro-debugger/view/hiding-panel.rkt
index ed54805..fc5f2f4 100644
--- a/macro-debugger/macro-debugger/view/hiding-panel.rkt
+++ b/macro-debugger/macro-debugger/view/hiding-panel.rkt
@@ -2,7 +2,7 @@
 (require racket/class
          racket/gui/base
          racket/match
-         unstable/class-iop
+         racket/class/iop
          "interfaces.rkt"
          macro-debugger/model/hiding-policies
          macro-debugger/util/mpi
diff --git a/macro-debugger/macro-debugger/view/interfaces.rkt b/macro-debugger/macro-debugger/view/interfaces.rkt
index bc697ad..9ecdbe7 100644
--- a/macro-debugger/macro-debugger/view/interfaces.rkt
+++ b/macro-debugger/macro-debugger/view/interfaces.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require unstable/class-iop
+(require racket/class/iop
          (prefix-in sb: macro-debugger/syntax-browser/interfaces))
 (provide (all-defined-out))
 
diff --git a/macro-debugger/macro-debugger/view/step-display.rkt b/macro-debugger/macro-debugger/view/step-display.rkt
index 6b19f93..dec55e9 100644
--- a/macro-debugger/macro-debugger/view/step-display.rkt
+++ b/macro-debugger/macro-debugger/view/step-display.rkt
@@ -2,7 +2,7 @@
 (require racket/class
          racket/match
          racket/gui/base
-         unstable/class-iop
+         racket/class/iop
          "interfaces.rkt"
          macro-debugger/model/steps
 	 (prefix-in sb: macro-debugger/syntax-browser/interfaces)
diff --git a/macro-debugger/macro-debugger/view/stepper.rkt b/macro-debugger/macro-debugger/view/stepper.rkt
index de59992..79fc7f4 100644
--- a/macro-debugger/macro-debugger/view/stepper.rkt
+++ b/macro-debugger/macro-debugger/view/stepper.rkt
@@ -2,7 +2,7 @@
 (require racket/class
          racket/match
          racket/gui/base
-         unstable/class-iop
+         racket/class/iop
          "interfaces.rkt"
          "extensions.rkt"
          "hiding-panel.rkt"
diff --git a/macro-debugger/macro-debugger/view/term-record.rkt b/macro-debugger/macro-debugger/view/term-record.rkt
index 5d2de34..0b363bc 100644
--- a/macro-debugger/macro-debugger/view/term-record.rkt
+++ b/macro-debugger/macro-debugger/view/term-record.rkt
@@ -3,7 +3,7 @@
          racket/match
          syntax/stx
          unstable/find
-         unstable/class-iop
+         racket/class/iop
          "interfaces.rkt"
          "step-display.rkt"
          macro-debugger/model/deriv
diff --git a/macro-debugger/macro-debugger/view/view.rkt b/macro-debugger/macro-debugger/view/view.rkt
index 8f794ae..3ae3126 100644
--- a/macro-debugger/macro-debugger/view/view.rkt
+++ b/macro-debugger/macro-debugger/view/view.rkt
@@ -2,7 +2,7 @@
 (require racket/class
          racket/gui/base
          framework
-         unstable/class-iop
+         racket/class/iop
          "interfaces.rkt"
          "frame.rkt"
          "prefs.rkt")