4 files changed, 17 insertions, 0 deletions

diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index 7e986fdd..43169fa0 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -32,7 +32,11 @@ import Network.Socket
 import Data.Hashable
 import qualified Data.HashMap.Strict as HashMap
          ;import Data.HashMap.Strict (HashMap)
+#if MIN_VERSION_iproute(1,7,4)
+import Data.IP hiding (fromSockAddr)
+#else
 import Data.IP
+#endif
 import Data.Ord
 import Data.Maybe
 import Data.Bits
diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index f3013142..5eb3742e 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -59,7 +59,11 @@ import qualified Data.ByteString.Char8        as C8
 import Data.Char
 import Data.Data
 import Data.Hashable
+#if MIN_VERSION_iproute(1,7,4)
+import Data.IP hiding (fromSockAddr)
+#else
 import Data.IP
+#endif
 import Data.List
 import Data.Maybe
 import Data.Serialize                         as S
diff --git a/src/Network/Tox/Onion/Handlers.hs b/src/Network/Tox/Onion/Handlers.hs
index 263d60bd..f497a1bf 100644
--- a/src/Network/Tox/Onion/Handlers.hs
+++ b/src/Network/Tox/Onion/Handlers.hs
@@ -44,7 +44,11 @@ import GHC.Conc (labelThread)
 import Control.Concurrent.STM
 import Data.Time.Clock.POSIX  (POSIXTime, getPOSIXTime)
 import Network.Socket
+#if MIN_VERSION_iproute(1,7,4)
+import Data.IP hiding (fromSockAddr)
+#else
 import Data.IP
+#endif
 import Data.Maybe
 import Data.Bits
 import Data.Ord
diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs
index 864e831f..0da48f76 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/src/Network/Tox/Onion/Transport.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                        #-}
 {-# LANGUAGE DataKinds                  #-}
 {-# LANGUAGE FlexibleContexts           #-}
 {-# LANGUAGE FlexibleInstances          #-}
@@ -65,7 +66,11 @@ import Data.Coerce
 import Data.Function
 import Data.Functor.Contravariant
 import Data.Functor.Identity
+#if MIN_VERSION_iproute(1,7,4)
+import Data.IP hiding (fromSockAddr)
+#else
 import Data.IP
+#endif
 import Data.Maybe
 import Data.Monoid
 import Data.Serialize               as S