diff --git a/library/Control/Monad/ST/Lazy/Safe.hs b/library/Control/Monad/ST/Lazy/Safe.hs
deleted file mode 100644
--- a/library/Control/Monad/ST/Lazy/Safe.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Control.Monad.ST.Lazy.Safe
-(
-  module Rebase.Control.Monad.ST.Lazy.Safe
-)
-where
-
-import Rebase.Control.Monad.ST.Lazy.Safe
diff --git a/library/Control/Monad/ST/Safe.hs b/library/Control/Monad/ST/Safe.hs
deleted file mode 100644
--- a/library/Control/Monad/ST/Safe.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Control.Monad.ST.Safe
-(
-  module Rebase.Control.Monad.ST.Safe
-)
-where
-
-import Rebase.Control.Monad.ST.Safe
diff --git a/library/Data/List1.hs b/library/Data/List1.hs
deleted file mode 100644
--- a/library/Data/List1.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Data.List1
-(
-  module Rebase.Data.List1
-)
-where
-
-import Rebase.Data.List1
diff --git a/library/Data/Semigroup/Foldable/Class.hs b/library/Data/Semigroup/Foldable/Class.hs
deleted file mode 100644
--- a/library/Data/Semigroup/Foldable/Class.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Data.Semigroup.Foldable.Class
-(
-  module Rebase.Data.Semigroup.Foldable.Class
-)
-where
-
-import Rebase.Data.Semigroup.Foldable.Class
diff --git a/library/Data/Traversable/Instances.hs b/library/Data/Traversable/Instances.hs
--- a/library/Data/Traversable/Instances.hs
+++ b/library/Data/Traversable/Instances.hs
@@ -1,7 +1,3 @@
-module Data.Traversable.Instances
-(
-  module Rebase.Data.Traversable.Instances
-)
-where
+module Data.Traversable.Instances where
 
-import Rebase.Data.Traversable.Instances
+import Rebase.Data.Traversable.Instances ()
diff --git a/library/Data/Vector/Instances.hs b/library/Data/Vector/Instances.hs
--- a/library/Data/Vector/Instances.hs
+++ b/library/Data/Vector/Instances.hs
@@ -1,7 +1,3 @@
-module Data.Vector.Instances
-(
-  module Rebase.Data.Vector.Instances
-)
-where
+module Data.Vector.Instances where
 
-import Rebase.Data.Vector.Instances
+import Rebase.Data.Vector.Instances ()
diff --git a/library/Foreign/ForeignPtr/Safe.hs b/library/Foreign/ForeignPtr/Safe.hs
deleted file mode 100644
--- a/library/Foreign/ForeignPtr/Safe.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Foreign.ForeignPtr.Safe
-(
-  module Rebase.Foreign.ForeignPtr.Safe
-)
-where
-
-import Rebase.Foreign.ForeignPtr.Safe
diff --git a/library/Foreign/Safe.hs b/library/Foreign/Safe.hs
deleted file mode 100644
--- a/library/Foreign/Safe.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Foreign.Safe
-(
-  module Rebase.Foreign.Safe
-)
-where
-
-import Rebase.Foreign.Safe
diff --git a/library/GHC/ConsoleHandler.hs b/library/GHC/ConsoleHandler.hs
deleted file mode 100644
--- a/library/GHC/ConsoleHandler.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module GHC.ConsoleHandler
-(
-  module Rebase.GHC.ConsoleHandler
-)
-where
-
-import Rebase.GHC.ConsoleHandler
diff --git a/library/GHC/Constants.hs b/library/GHC/Constants.hs
deleted file mode 100644
--- a/library/GHC/Constants.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module GHC.Constants
-(
-  module Rebase.GHC.Constants
-)
-where
-
-import Rebase.GHC.Constants
diff --git a/library/GHC/GHCi.hs b/library/GHC/GHCi.hs
deleted file mode 100644
--- a/library/GHC/GHCi.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module GHC.GHCi
-(
-  module Rebase.GHC.GHCi
-)
-where
-
-import Rebase.GHC.GHCi
diff --git a/library/GHC/IO/Encoding/CodePage.hs b/library/GHC/IO/Encoding/CodePage.hs
deleted file mode 100644
--- a/library/GHC/IO/Encoding/CodePage.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module GHC.IO.Encoding.CodePage
-(
-  module Rebase.GHC.IO.Encoding.CodePage
-)
-where
-
-import Rebase.GHC.IO.Encoding.CodePage
diff --git a/library/GHC/Pack.hs b/library/GHC/Pack.hs
deleted file mode 100644
--- a/library/GHC/Pack.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module GHC.Pack
-(
-  module Rebase.GHC.Pack
-)
-where
-
-import Rebase.GHC.Pack
diff --git a/library/Text/Show/Functions.hs b/library/Text/Show/Functions.hs
deleted file mode 100644
--- a/library/Text/Show/Functions.hs
+++ /dev/null
@@ -1,7 +0,0 @@
-module Text.Show.Functions
-(
-  module Rebase.Text.Show.Functions
-)
-where
-
-import Rebase.Text.Show.Functions
diff --git a/rerebase.cabal b/rerebase.cabal
--- a/rerebase.cabal
+++ b/rerebase.cabal
@@ -1,6 +1,6 @@
 cabal-version: 3.0
 name:          rerebase
-version:       1.20.2
+version:       1.21
 synopsis:
   Reexports from "base" with a bunch of other standard libraries
 
@@ -64,9 +64,7 @@
     Control.Monad.Signatures
     Control.Monad.ST
     Control.Monad.ST.Lazy
-    Control.Monad.ST.Lazy.Safe
     Control.Monad.ST.Lazy.Unsafe
-    Control.Monad.ST.Safe
     Control.Monad.ST.Strict
     Control.Monad.ST.Unsafe
     Control.Monad.State
@@ -181,7 +179,6 @@
     Data.Kind
     Data.List
     Data.List.NonEmpty
-    Data.List1
     Data.Map
     Data.Map.Lazy
     Data.Map.Strict
@@ -211,7 +208,6 @@
     Data.Semigroup.Bifoldable
     Data.Semigroup.Bitraversable
     Data.Semigroup.Foldable
-    Data.Semigroup.Foldable.Class
     Data.Semigroup.Traversable
     Data.Semigroup.Traversable.Class
     Data.Semigroupoid
@@ -295,7 +291,6 @@
     Foreign.C.Types
     Foreign.Concurrent
     Foreign.ForeignPtr
-    Foreign.ForeignPtr.Safe
     Foreign.ForeignPtr.Unsafe
     Foreign.Marshal
     Foreign.Marshal.Alloc
@@ -306,7 +301,6 @@
     Foreign.Marshal.Unsafe
     Foreign.Marshal.Utils
     Foreign.Ptr
-    Foreign.Safe
     Foreign.StablePtr
     Foreign.Storable
     GHC.Arr
@@ -316,8 +310,6 @@
     GHC.Conc.IO
     GHC.Conc.Signal
     GHC.Conc.Sync
-    GHC.ConsoleHandler
-    GHC.Constants
     GHC.Desugar
     GHC.Enum
     GHC.Environment
@@ -332,14 +324,12 @@
     GHC.Foreign
     GHC.ForeignPtr
     GHC.Generics
-    GHC.GHCi
     GHC.Int
     GHC.IO
     GHC.IO.Buffer
     GHC.IO.BufferedIO
     GHC.IO.Device
     GHC.IO.Encoding
-    GHC.IO.Encoding.CodePage
     GHC.IO.Encoding.Failure
     GHC.IO.Encoding.Iconv
     GHC.IO.Encoding.Latin1
@@ -361,7 +351,6 @@
     GHC.MVar
     GHC.Num
     GHC.OverloadedLabels
-    GHC.Pack
     GHC.Profiling
     GHC.Ptr
     GHC.Read
@@ -403,8 +392,7 @@
     Text.Read
     Text.Read.Lex
     Text.Show
-    Text.Show.Functions
     Unsafe.Coerce
 
   exposed:          False
-  build-depends:    rebase ==1.20.2
+  build-depends:    rebase ==1.21
