6 files changed, 8 insertions, 7 deletions
diff --git a/Utility/Directory.hs b/Utility/Directory.hs
index bc24828fb..3b12b9fc0 100644
--- a/Utility/Directory.hs
+++ b/Utility/Directory.hs
@@ -6,9 +6,12 @@
  -}
 
 {-# LANGUAGE CPP #-}
-{-# OPTIONS_GHC -fno-warn-tabs #-}
+{-# OPTIONS_GHC -fno-warn-tabs -w #-}
 
-module Utility.Directory where
+module Utility.Directory (
+	module Utility.Directory,
+	module System.Directory
+) where
 
 import System.IO.Error
 import System.Directory hiding (isSymbolicLink)
diff --git a/Utility/FreeDesktop.hs b/Utility/FreeDesktop.hs
index 78c103528..abaa313df 100644
--- a/Utility/FreeDesktop.hs
+++ b/Utility/FreeDesktop.hs
@@ -33,9 +33,9 @@ import Utility.Path
 import Utility.UserInfo
 import Utility.Process
 import Utility.PartialPrelude
+import Utility.Directory
 
 import System.Environment
-import System.Directory hiding (isSymbolicLink)
 import System.FilePath
 import Data.List
 import Data.String.Utils
diff --git a/Utility/LinuxMkLibs.hs b/Utility/LinuxMkLibs.hs
index 016053303..122f39643 100644
--- a/Utility/LinuxMkLibs.hs
+++ b/Utility/LinuxMkLibs.hs
@@ -14,7 +14,6 @@ import Utility.Monad
 import Utility.Path
 
 import Data.Maybe
-import System.Directory hiding (isSymbolicLink)
 import System.FilePath
 import Data.List.Utils
 import System.Posix.Files
diff --git a/Utility/LockFile/PidLock.hs b/Utility/LockFile/PidLock.hs
index 50c38d70c..6a3e86a3f 100644
--- a/Utility/LockFile/PidLock.hs
+++ b/Utility/LockFile/PidLock.hs
@@ -34,7 +34,6 @@ import Data.List
 import Network.BSD
 import System.FilePath
 import Data.Hash.MD5
-import System.Directory hiding (isSymbolicLink)
 import Control.Applicative
 import Prelude
 
diff --git a/Utility/Path.hs b/Utility/Path.hs
index 729300c43..3ee5ff39d 100644
--- a/Utility/Path.hs
+++ b/Utility/Path.hs
@@ -12,7 +12,6 @@ module Utility.Path where
 
 import Data.String.Utils
 import System.FilePath
-import System.Directory hiding (isSymbolicLink)
 import Data.List
 import Data.Maybe
 import Data.Char
@@ -29,6 +28,7 @@ import Utility.Exception
 import qualified "MissingH" System.Path as MissingH
 import Utility.Monad
 import Utility.UserInfo
+import Utility.Directory
 
 {- Simplifies a path, removing any "." component, collapsing "dir/..", 
  - and removing the trailing path separator.
diff --git a/Utility/Tmp.hs b/Utility/Tmp.hs
index 11bab027d..6a541cfe4 100644
--- a/Utility/Tmp.hs
+++ b/Utility/Tmp.hs
@@ -11,9 +11,9 @@
 module Utility.Tmp where
 
 import System.IO
-import System.Directory hiding (isSymbolicLink)
 import Control.Monad.IfElse
 import System.FilePath
+import System.Directory
 import Control.Monad.IO.Class
 #ifndef mingw32_HOST_OS
 import System.Posix.Temp (mkdtemp)