remove 163 lines of code without changing anything except imports

11 files changed, 11 insertions, 13 deletions

diff --git a/Remote/Helper/AWS.hs b/Remote/Helper/AWS.hs
index 145c48714..4919b4b40 100644
--- a/Remote/Helper/AWS.hs
+++ b/Remote/Helper/AWS.hs
@@ -10,7 +10,7 @@
 
 module Remote.Helper.AWS where
 
-import Common.Annex
+import Annex.Common
 import Creds
 
 import qualified Data.Map as M
diff --git a/Remote/Helper/Chunked.hs b/Remote/Helper/Chunked.hs
index 7692abeb5..8098abc4f 100644
--- a/Remote/Helper/Chunked.hs
+++ b/Remote/Helper/Chunked.hs
@@ -17,11 +17,10 @@ module Remote.Helper.Chunked (
 	checkPresentChunks,
 ) where
 
-import Common.Annex
+import Annex.Common
 import Utility.DataUnits
 import Types.StoreRetrieve
 import Types.Remote
-import Types.Key
 import Logs.Chunk
 import Utility.Metered
 import Crypto (EncKey)
diff --git a/Remote/Helper/Chunked/Legacy.hs b/Remote/Helper/Chunked/Legacy.hs
index ae3a29f32..290220c2c 100644
--- a/Remote/Helper/Chunked/Legacy.hs
+++ b/Remote/Helper/Chunked/Legacy.hs
@@ -7,7 +7,7 @@
 
 module Remote.Helper.Chunked.Legacy where
 
-import Common.Annex
+import Annex.Common
 import Remote.Helper.Chunked
 import Utility.Metered
 
diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs
index 562009df6..6d294b915 100644
--- a/Remote/Helper/Encryptable.hs
+++ b/Remote/Helper/Encryptable.hs
@@ -24,7 +24,7 @@ import qualified "sandi" Codec.Binary.Base64 as B64
 import qualified Data.ByteString as B
 import Data.Bits.Utils
 
-import Common.Annex
+import Annex.Common
 import Types.Remote
 import Crypto
 import Types.Crypto
diff --git a/Remote/Helper/Git.hs b/Remote/Helper/Git.hs
index 3b438a0bb..5c611e46a 100644
--- a/Remote/Helper/Git.hs
+++ b/Remote/Helper/Git.hs
@@ -7,7 +7,7 @@
 
 module Remote.Helper.Git where
 
-import Common.Annex
+import Annex.Common
 import qualified Git
 import Types.Availability
 import qualified Types.Remote as Remote
diff --git a/Remote/Helper/Hooks.hs b/Remote/Helper/Hooks.hs
index 96cca242e..a8e7c9ad3 100644
--- a/Remote/Helper/Hooks.hs
+++ b/Remote/Helper/Hooks.hs
@@ -11,7 +11,7 @@ module Remote.Helper.Hooks (addHooks) where
 
 import qualified Data.Map as M
 
-import Common.Annex
+import Annex.Common
 import Types.Remote
 import Types.CleanupActions
 import qualified Annex
diff --git a/Remote/Helper/Http.hs b/Remote/Helper/Http.hs
index 81c1654ef..f01dfd922 100644
--- a/Remote/Helper/Http.hs
+++ b/Remote/Helper/Http.hs
@@ -9,7 +9,7 @@
 
 module Remote.Helper.Http where
 
-import Common.Annex
+import Annex.Common
 import Types.StoreRetrieve
 import Utility.Metered
 import Remote.Helper.Special
diff --git a/Remote/Helper/Messages.hs b/Remote/Helper/Messages.hs
index 6e72758fb..484ea1955 100644
--- a/Remote/Helper/Messages.hs
+++ b/Remote/Helper/Messages.hs
@@ -9,7 +9,7 @@
 
 module Remote.Helper.Messages where
 
-import Common.Annex
+import Annex.Common
 import qualified Git
 import qualified Types.Remote as Remote
 
diff --git a/Remote/Helper/ReadOnly.hs b/Remote/Helper/ReadOnly.hs
index c0330e453..2b6d7467e 100644
--- a/Remote/Helper/ReadOnly.hs
+++ b/Remote/Helper/ReadOnly.hs
@@ -12,7 +12,7 @@ module Remote.Helper.ReadOnly
 	, readonlyRemoveKey
 	) where
 
-import Common.Annex
+import Annex.Common
 import Types.Remote
 import Types.StoreRetrieve
 import Utility.Metered
diff --git a/Remote/Helper/Special.hs b/Remote/Helper/Special.hs
index d586d8c0a..fdadc97b9 100644
--- a/Remote/Helper/Special.hs
+++ b/Remote/Helper/Special.hs
@@ -32,7 +32,7 @@ module Remote.Helper.Special (
 	module X
 ) where
 
-import Common.Annex
+import Annex.Common
 import qualified Annex
 import Types.StoreRetrieve
 import Types.Remote
diff --git a/Remote/Helper/Ssh.hs b/Remote/Helper/Ssh.hs
index 1545fa21d..cef30082b 100644
--- a/Remote/Helper/Ssh.hs
+++ b/Remote/Helper/Ssh.hs
@@ -7,7 +7,7 @@
 
 module Remote.Helper.Ssh where
 
-import Common.Annex
+import Annex.Common
 import qualified Annex
 import qualified Git
 import qualified Git.Url
@@ -15,7 +15,6 @@ import Annex.UUID
 import Annex.Ssh
 import CmdLine.GitAnnexShell.Fields (Field, fieldName)
 import qualified CmdLine.GitAnnexShell.Fields as Fields
-import Types.Key
 import Remote.Helper.Messages
 import Messages.Progress
 import Utility.Metered