4 files changed, 4 insertions, 4 deletions

diff --git a/src/Network/BitTorrent/DHT/Message.hs b/src/Network/BitTorrent/DHT/Message.hs
index 706d181a..2a2cee35 100644
--- a/src/Network/BitTorrent/DHT/Message.hs
+++ b/src/Network/BitTorrent/DHT/Message.hs
@@ -117,7 +117,7 @@ import Network.BitTorrent.DHT.Token
 import Network.DatagramServer ()
 import Network.DHT.Mainline ()
 #endif
-import Network.RPC hiding (Query,Response)
+import Network.DatagramServer.Types hiding (Query,Response)
 
 {-----------------------------------------------------------------------
 -- envelopes
diff --git a/src/Network/BitTorrent/DHT/Query.hs b/src/Network/BitTorrent/DHT/Query.hs
index 0219adfa..90cdcbee 100644
--- a/src/Network/BitTorrent/DHT/Query.hs
+++ b/src/Network/BitTorrent/DHT/Query.hs
@@ -99,7 +99,7 @@ import Data.ByteString (ByteString)
 import Data.Tox
 #endif
 import Network.BitTorrent.Address hiding (NodeId)
-import Network.RPC as RPC hiding (Query,Response)
+import Network.DatagramServer.Types as RPC hiding (Query,Response)
 
 {-----------------------------------------------------------------------
 --  Handlers
diff --git a/src/Network/BitTorrent/DHT/Routing.hs b/src/Network/BitTorrent/DHT/Routing.hs
index 42728a53..c64678e0 100644
--- a/src/Network/BitTorrent/DHT/Routing.hs
+++ b/src/Network/BitTorrent/DHT/Routing.hs
@@ -315,7 +315,7 @@ split i b = (Bucket ns qs, Bucket ms rs)
     (qs,rs) = runIdentity $ partitionQ bucketQ spanBit $ bktQ b
     {-
     spanBit :: forall (dht :: * -> *) addr u.
-               FiniteBits (Network.RPC.NodeId dht) =>
+               FiniteBits (Network.DatagramServer.Types.NodeId dht) =>
                NodeInfo dht addr u -> Bool
     -}
     spanBit :: NodeInfo dht addr u -> Bool
diff --git a/src/Network/BitTorrent/DHT/Search.hs b/src/Network/BitTorrent/DHT/Search.hs
index 844b4575..c60ae48f 100644
--- a/src/Network/BitTorrent/DHT/Search.hs
+++ b/src/Network/BitTorrent/DHT/Search.hs
@@ -24,7 +24,7 @@ import qualified Data.MinMaxPSQ   as MM
 import qualified Data.Wrapper.PSQ as PSQ
          ;import Data.Wrapper.PSQ (pattern (:->), Binding, PSQ)
 import Network.BitTorrent.Address hiding (NodeId)
-import Network.RPC
+import Network.DatagramServer.Types
 #ifdef VERSION_bencoding
 import Network.DHT.Mainline ()
 import Network.KRPC.Message (KMessageOf)