diff --git a/happstack-util.cabal b/happstack-util.cabal
--- a/happstack-util.cabal
+++ b/happstack-util.cabal
@@ -1,5 +1,5 @@
 Name:                happstack-util
-Version:             0.3.2
+Version:             0.4.1
 Synopsis:            Web framework
 License:             BSD3
 License-file:        COPYING
@@ -14,7 +14,7 @@
 source-repository head
     type:     darcs
     subdir:   happstack-util
-    location: http://patch-tag.com/publicrepos/happstack
+    location: http://patch-tag.com/r/mae/happstack/pullrepo
 
 Flag base4
     Description: Choose the even newer, even smaller, split-up base package.
@@ -36,6 +36,7 @@
                        process,
                        time,
                        QuickCheck < 2,
+                       HUnit,
                        random,
                        SMTPClient >= 1.0.1 && < 1.1,
                        strict-concurrency,
diff --git a/src/Happstack/Util/FileManip.hs b/src/Happstack/Util/FileManip.hs
--- a/src/Happstack/Util/FileManip.hs
+++ b/src/Happstack/Util/FileManip.hs
@@ -3,17 +3,13 @@
 module Happstack.Util.FileManip (always, find) where
 
 import qualified System.PosixCompat.Files as F
-import qualified System.PosixCompat.Types as T
-import Control.Monad
 import Control.Monad.State
-import Control.Exception.Extensible (Exception)
 import qualified Control.Exception.Extensible as E
-import Data.Bits
 import System.IO
 import Data.List (sort)
 import System.Directory (getDirectoryContents)
-import System.IO.Unsafe (unsafeInterleaveIO, unsafePerformIO)
-import System.FilePath ((</>), takeDirectory, takeExtension, takeFileName)
+import System.IO.Unsafe (unsafeInterleaveIO)
+import System.FilePath ((</>))
 
 
 -- | Information collected during the traversal of a directory.
diff --git a/src/Happstack/Util/OpenExclusively.hs b/src/Happstack/Util/OpenExclusively.hs
--- a/src/Happstack/Util/OpenExclusively.hs
+++ b/src/Happstack/Util/OpenExclusively.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
  -- | Cross platform way to open a file exclusively
 module Happstack.Util.OpenExclusively
     ( -- | Cross platform way to open a file exclusively