9 files changed, 37 insertions, 8 deletions
diff --git a/libraries/base/GHC/Event/Internal/Types.hs b/libraries/base/GHC/Event/Internal/Types.hs
index 1ff02efa53..e02ff36b61 100644
--- a/libraries/base/GHC/Event/Internal/Types.hs
+++ b/libraries/base/GHC/Event/Internal/Types.hs
@@ -33,7 +33,7 @@ module GHC.Event.Internal.Types
     , Timeout(..)
     ) where
 
-import Data.List (foldl', filter, intercalate, null)
+import Data.OldList (foldl', filter, intercalate, null)
 
 import Data.Bits ((.|.), (.&.))
 import Data.Semigroup.Internal (stimesMonoid)
diff --git a/libraries/base/GHC/Event/Manager.hs b/libraries/base/GHC/Event/Manager.hs
index b086cbe748..88bf450426 100644
--- a/libraries/base/GHC/Event/Manager.hs
+++ b/libraries/base/GHC/Event/Manager.hs
@@ -67,7 +67,7 @@ import Data.Functor (void)
 import Data.IORef (IORef, atomicModifyIORef', mkWeakIORef, newIORef, readIORef,
                    writeIORef)
 import Data.Maybe (maybe)
-import Data.List (partition)
+import Data.OldList (partition)
 import GHC.Arr (Array, (!), listArray)
 import GHC.Base
 import GHC.Conc.Sync (yield)
diff --git a/libraries/base/GHC/Event/Windows.hsc b/libraries/base/GHC/Event/Windows.hsc
index dd0b2d9db9..b97250e897 100644
--- a/libraries/base/GHC/Event/Windows.hsc
+++ b/libraries/base/GHC/Event/Windows.hsc
@@ -104,7 +104,7 @@ import GHC.Exception as E
 import GHC.IORef
 import GHC.Maybe
 import GHC.Word
-import Data.List (deleteBy)
+import GHC.OldList (deleteBy)
 import Foreign
 import qualified GHC.Event.Array    as A
 import GHC.Base
diff --git a/libraries/base/GHC/Exception.hs b/libraries/base/GHC/Exception.hs
index a2a457891a..abaa308aec 100644
--- a/libraries/base/GHC/Exception.hs
+++ b/libraries/base/GHC/Exception.hs
@@ -37,7 +37,7 @@ module GHC.Exception
 import GHC.Base
 import GHC.Show
 import GHC.Stack.Types
-import Data.List (intercalate, reverse) -- TODO: remove import list?
+import GHC.OldList
 import GHC.Prim
 import GHC.IO.Unsafe
 import {-# SOURCE #-} GHC.Stack.CCS
diff --git a/libraries/base/GHC/Exts.hs b/libraries/base/GHC/Exts.hs
index 29f6bdaca0..b9d632095c 100755
--- a/libraries/base/GHC/Exts.hs
+++ b/libraries/base/GHC/Exts.hs
@@ -143,7 +143,7 @@ import GHC.Stack
 
 import qualified Data.Coerce
 import Data.String
-import Data.List (all, sortBy, span)
+import Data.OldList
 import Data.Data
 import Data.Ord
 import Data.Version ( Version(..), makeVersion )
diff --git a/libraries/base/GHC/IO/Encoding/CodePage.hs b/libraries/base/GHC/IO/Encoding/CodePage.hs
index 597e426ca1..39430c5ee0 100644
--- a/libraries/base/GHC/IO/Encoding/CodePage.hs
+++ b/libraries/base/GHC/IO/Encoding/CodePage.hs
@@ -27,7 +27,7 @@ import GHC.IO.Encoding.Types
 import GHC.IO.Buffer
 import Data.Bits
 import Data.Maybe
-import Data.List (lookup)
+import Data.OldList (lookup)
 
 import qualified GHC.IO.Encoding.CodePage.API as API
 import GHC.IO.Encoding.CodePage.Table
diff --git a/libraries/base/GHC/IO/Exception.hs b/libraries/base/GHC/IO/Exception.hs
index 3909132687..758a84bf32 100644
--- a/libraries/base/GHC/IO/Exception.hs
+++ b/libraries/base/GHC/IO/Exception.hs
@@ -54,7 +54,7 @@ import GHC.Show
 import GHC.Read
 import GHC.Exception
 import GHC.IO.Handle.Types
-import Data.List ( intercalate )
+import GHC.OldList ( intercalate )
 import {-# SOURCE #-} GHC.Stack.CCS
 import Foreign.C.Types
 
diff --git a/libraries/base/GHC/OldList.hs b/libraries/base/GHC/OldList.hs
new file mode 100644
index 0000000000..cfb7314636
--- /dev/null
+++ b/libraries/base/GHC/OldList.hs
@@ -0,0 +1,29 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE Safe #-}
+
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  GHC.OldList
+-- Copyright   :  (c) The University of Glasgow 2001
+-- License     :  BSD-style (see the file libraries/base/LICENSE)
+--
+-- Maintainer  :  libraries@haskell.org
+-- Stability   :  experimental
+-- Portability :  portable
+--
+-- This legacy module provides access to the list-specialised operations
+-- of "Data.List". This module may go away again in future GHC versions and
+-- is provided as transitional tool to access some of the list-specialised
+-- operations that had to be generalised due to the implementation of the
+-- <https://wiki.haskell.org/Foldable_Traversable_In_Prelude Foldable/Traversable-in-Prelude Proposal (FTP)>.
+--
+-- If the operations needed are available in "GHC.List", it's
+-- recommended to avoid importing this module and use "GHC.List"
+-- instead for now.
+--
+-- @since 4.8.0.0
+-----------------------------------------------------------------------------
+
+module GHC.OldList (module Data.OldList) where
+
+import Data.OldList
diff --git a/libraries/base/GHC/Windows.hs b/libraries/base/GHC/Windows.hs
index 2cee2d8908..be0c3837a9 100644
--- a/libraries/base/GHC/Windows.hs
+++ b/libraries/base/GHC/Windows.hs
@@ -76,7 +76,7 @@ module GHC.Windows (
 
 import Data.Bits (finiteBitSize, shiftL, shiftR, (.|.), (.&.))
 import Data.Char
-import Data.List (dropWhileEnd)
+import Data.OldList
 import Data.Maybe
 import Data.Word
 import Data.Int