3 files changed, 3 insertions, 5 deletions

diff --git a/src/Data/Torrent/Layout.hs b/src/Data/Torrent/Layout.hs
index 7ed8679d..a32d74fa 100644
--- a/src/Data/Torrent/Layout.hs
+++ b/src/Data/Torrent/Layout.hs
@@ -81,8 +81,6 @@ import Text.PrettyPrint.Class
 import System.FilePath
 import System.Posix.Types
 
-import Data.Torrent.Block
-
 
 {-----------------------------------------------------------------------
 --  File attribytes
@@ -274,7 +272,7 @@ fileCount MultiFile  {..} = L.length liFiles
 
 -- | Find number of blocks of the specified size. If torrent size is
 -- not a multiple of block size then the count is rounded up.
-blockCount :: BlockSize -> LayoutInfo -> Int
+blockCount :: Int -> LayoutInfo -> Int
 blockCount blkSize ci = contentLength ci `sizeInBase` blkSize
 
 {-----------------------------------------------------------------------
diff --git a/src/Data/Torrent/Block.hs b/src/Network/BitTorrent/Exchange/Block.hs
index 88f7f352..e99dd49d 100644
--- a/src/Data/Torrent/Block.hs
+++ b/src/Network/BitTorrent/Exchange/Block.hs
@@ -12,7 +12,7 @@
 {-# LANGUAGE DeriveFunctor              #-}
 {-# LANGUAGE DeriveDataTypeable         #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-module Data.Torrent.Block
+module Network.BitTorrent.Exchange.Block
        ( -- * Block attributes
          BlockOffset
        , BlockCount
diff --git a/src/Network/BitTorrent/Exchange/Message.hs b/src/Network/BitTorrent/Exchange/Message.hs
index 2f85d729..8a88b761 100644
--- a/src/Network/BitTorrent/Exchange/Message.hs
+++ b/src/Network/BitTorrent/Exchange/Message.hs
@@ -90,10 +90,10 @@ import Text.PrettyPrint as PP
 import Text.PrettyPrint.Class
 
 import Data.Torrent.Bitfield
-import Data.Torrent.Block
 import Data.Torrent.InfoHash
 import Network.BitTorrent.Core.PeerId
 import Network.BitTorrent.Core.PeerAddr ()
+import Network.BitTorrent.Exchange.Block
 
 {-----------------------------------------------------------------------
 --  Extensions