15 files changed, 17 insertions, 3 deletions
diff --git a/libraries/base/System/CPUTime.hsc b/libraries/base/System/CPUTime.hsc
index 90ff1e9656..f07b2e448d 100644
--- a/libraries/base/System/CPUTime.hsc
+++ b/libraries/base/System/CPUTime.hsc
@@ -1,3 +1,4 @@
+{-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE CPP, NondecreasingIndentation, ForeignFunctionInterface #-}
 
 -----------------------------------------------------------------------------
@@ -33,7 +34,7 @@ import CPUTime ( getCPUTime, cpuTimePrecision )
 #endif
 
 #ifdef __GLASGOW_HASKELL__
-import Foreign hiding (unsafePerformIO)
+import Foreign.Safe
 import Foreign.C
 #if !defined(CLK_TCK)
 import System.IO.Unsafe (unsafePerformIO)
diff --git a/libraries/base/System/Console/GetOpt.hs b/libraries/base/System/Console/GetOpt.hs
index 92ebd52055..d5a32f395f 100644
--- a/libraries/base/System/Console/GetOpt.hs
+++ b/libraries/base/System/Console/GetOpt.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Safe #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.Console.GetOpt
diff --git a/libraries/base/System/Environment.hs b/libraries/base/System/Environment.hs
index cf73c3d9bc..e185575147 100644
--- a/libraries/base/System/Environment.hs
+++ b/libraries/base/System/Environment.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Safe #-}
 {-# LANGUAGE CPP, ForeignFunctionInterface #-}
 
 -----------------------------------------------------------------------------
@@ -31,7 +32,7 @@ module System.Environment
 import Prelude
 
 #ifdef __GLASGOW_HASKELL__
-import Foreign
+import Foreign.Safe
 import Foreign.C
 import Control.Exception.Base   ( bracket )
 -- import GHC.IO
diff --git a/libraries/base/System/Exit.hs b/libraries/base/System/Exit.hs
index 7eb17cfbfe..9a9ed00045 100644
--- a/libraries/base/System/Exit.hs
+++ b/libraries/base/System/Exit.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE CPP #-}
 
 -----------------------------------------------------------------------------
diff --git a/libraries/base/System/IO.hs b/libraries/base/System/IO.hs
index bf26835eef..768d557653 100644
--- a/libraries/base/System/IO.hs
+++ b/libraries/base/System/IO.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE CPP, NoImplicitPrelude #-}
 
 -----------------------------------------------------------------------------
diff --git a/libraries/base/System/IO/Error.hs b/libraries/base/System/IO/Error.hs
index a026f338a1..1458d60bed 100644
--- a/libraries/base/System/IO/Error.hs
+++ b/libraries/base/System/IO/Error.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE CPP, NoImplicitPrelude #-}
 
 -----------------------------------------------------------------------------
diff --git a/libraries/base/System/IO/Unsafe.hs b/libraries/base/System/IO/Unsafe.hs
index 3ef3d9f3e0..719bd3eed5 100644
--- a/libraries/base/System/IO/Unsafe.hs
+++ b/libraries/base/System/IO/Unsafe.hs
@@ -21,7 +21,7 @@ module System.IO.Unsafe (
   ) where
 
 #ifdef __GLASGOW_HASKELL__
-import GHC.IO (unsafePerformIO, unsafeInterleaveIO)
+import GHC.IO      (unsafePerformIO, unsafeInterleaveIO)
 #endif
 
 #ifdef __HUGS__
diff --git a/libraries/base/System/Info.hs b/libraries/base/System/Info.hs
index 92da1a64b7..5fc816c080 100644
--- a/libraries/base/System/Info.hs
+++ b/libraries/base/System/Info.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Safe #-}
 {-# LANGUAGE CPP #-}
 
 -----------------------------------------------------------------------------
diff --git a/libraries/base/System/Mem.hs b/libraries/base/System/Mem.hs
index af96b5dd1c..67b80cc320 100644
--- a/libraries/base/System/Mem.hs
+++ b/libraries/base/System/Mem.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Safe #-}
 {-# LANGUAGE CPP #-}
 
 #ifdef __GLASGOW_HASKELL__
diff --git a/libraries/base/System/Mem/StableName.hs b/libraries/base/System/Mem/StableName.hs
index 2bce839dd2..7d688e9aa8 100644
--- a/libraries/base/System/Mem/StableName.hs
+++ b/libraries/base/System/Mem/StableName.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE CPP #-}
 #ifdef __GLASGOW_HASKELL__
 {-# LANGUAGE DeriveDataTypeable, StandaloneDeriving #-}
diff --git a/libraries/base/System/Mem/Weak.hs b/libraries/base/System/Mem/Weak.hs
index 21411e531c..8980a51b55 100644
--- a/libraries/base/System/Mem/Weak.hs
+++ b/libraries/base/System/Mem/Weak.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE CPP #-}
 
 -----------------------------------------------------------------------------
diff --git a/libraries/base/System/Posix/Internals.hs b/libraries/base/System/Posix/Internals.hs
index 6a30ba07e8..632e69eb27 100644
--- a/libraries/base/System/Posix/Internals.hs
+++ b/libraries/base/System/Posix/Internals.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE CPP, NoImplicitPrelude, ForeignFunctionInterface #-}
 {-# OPTIONS_HADDOCK hide #-}
 
diff --git a/libraries/base/System/Posix/Internals.hs-boot b/libraries/base/System/Posix/Internals.hs-boot
index 40415fcd61..ff4c4e8427 100644
--- a/libraries/base/System/Posix/Internals.hs-boot
+++ b/libraries/base/System/Posix/Internals.hs-boot
@@ -1,3 +1,4 @@
+{-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 module System.Posix.Internals where
 
diff --git a/libraries/base/System/Posix/Types.hs b/libraries/base/System/Posix/Types.hs
index 9bb85e298a..c8c0c486b4 100644
--- a/libraries/base/System/Posix/Types.hs
+++ b/libraries/base/System/Posix/Types.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE CPP
            , NoImplicitPrelude
            , MagicHash
diff --git a/libraries/base/System/Timeout.hs b/libraries/base/System/Timeout.hs
index df33625c8d..d1cbbffc91 100644
--- a/libraries/base/System/Timeout.hs
+++ b/libraries/base/System/Timeout.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE CPP #-}
 #ifdef __GLASGOW_HASKELL__
 {-# LANGUAGE DeriveDataTypeable, StandaloneDeriving #-}