diff --git a/snap-server.cabal b/snap-server.cabal
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -1,5 +1,5 @@
 name:           snap-server
-version:        0.2.16
+version:        0.2.16.1
 synopsis:       A fast, iteratee-based, epoll-enabled web server for the Snap Framework
 description:
   This is the first developer prerelease of the Snap framework.  Snap is a
@@ -123,7 +123,7 @@
     murmur-hash >= 0.1 && < 0.2,
     network == 2.2.1.*,
     old-locale,
-    snap-core == 0.2.16,
+    snap-core == 0.2.17,
     template-haskell,
     time,
     transformers,
diff --git a/src/Snap/Internal/Http/Server.hs b/src/Snap/Internal/Http/Server.hs
--- a/src/Snap/Internal/Http/Server.hs
+++ b/src/Snap/Internal/Http/Server.hs
@@ -42,7 +42,7 @@
 import           Snap.Internal.Http.Parser
 import           Snap.Internal.Http.Server.Date
 import           Snap.Internal.Iteratee.Debug
-import           Snap.Iteratee hiding (foldl', head, take, mapM_, FileOffset)
+import           Snap.Iteratee hiding (foldl', head, take, FileOffset)
 import qualified Snap.Iteratee as I
 
 #ifdef LIBEV
@@ -664,9 +664,9 @@
     --------------------------------------------------------------------------
     putHdrs hdrs =
         {-# SCC "putHdrs" #-}
-        mapM_ putHeader $ Map.toList hdrs
+        Prelude.mapM_ putHeader $ Map.toList hdrs
       where
-        putHeader (k, ys) = mapM_ (putOne k) ys
+        putHeader (k, ys) = Prelude.mapM_ (putOne k) ys
 
         putOne k y = do
             putByteString $ unCI k