diff --git a/Annex/FileMatcher.hs b/Annex/FileMatcher.hs
index 5476d7bcda..6358049309 100644
--- a/Annex/FileMatcher.hs
+++ b/Annex/FileMatcher.hs
@@ -35,8 +35,10 @@ import Types.FileMatcher
 import Git.FilePath
 import Types.Remote (RemoteConfig)
 import Annex.CheckAttr
-import Annex.Magic
 import Git.CheckAttr (unspecifiedAttr)
+#ifdef WITH_MAGICMIME
+import Annex.Magic
+#endif
 
 import Data.Either
 import qualified Data.Set as S
diff --git a/Build/DesktopFile.hs b/Build/DesktopFile.hs
index d66be70a63..14efb24df8 100644
--- a/Build/DesktopFile.hs
+++ b/Build/DesktopFile.hs
@@ -22,10 +22,12 @@ import Assistant.Install.AutoStart
 import Assistant.Install.Menu
 
 import System.Environment
+#ifndef mingw32_HOST_OS 
 import System.PosixCompat.User
 import Data.Maybe
 import Control.Applicative
 import Prelude
+#endif
 
 systemwideInstall :: IO Bool
 #ifndef mingw32_HOST_OS 
diff --git a/Utility/Env/Set.hs b/Utility/Env/Set.hs
index bd835e9787..9d17090b9b 100644
--- a/Utility/Env/Set.hs
+++ b/Utility/Env/Set.hs
@@ -10,7 +10,6 @@
 module Utility.Env.Set where
 
 #ifdef mingw32_HOST_OS
-import qualified System.Environment as E
 import qualified System.SetEnv
 import Utility.Env
 #else
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs
index 7632d1da7d..5be1ff528d 100644
--- a/Utility/Gpg.hs
+++ b/Utility/Gpg.hs
@@ -16,10 +16,10 @@ import System.Posix.Types
 import System.Posix.IO
 import Utility.Env
 import Utility.Env.Set
+import Utility.FileMode
 #else
 import Utility.Tmp
 #endif
-import Utility.FileMode
 import Utility.Format (decode_c)
 
 import Control.Concurrent
diff --git a/Utility/InodeCache.hs b/Utility/InodeCache.hs
index 648e6ade21..af39219b3b 100644
--- a/Utility/InodeCache.hs
+++ b/Utility/InodeCache.hs
@@ -48,7 +48,6 @@ import Data.Time.Clock.POSIX
 
 #ifdef mingw32_HOST_OS
 import Data.Word (Word64)
-import System.Directory
 #else
 import System.Posix.Files
 #endif
diff --git a/Utility/Path/Max.hs b/Utility/Path/Max.hs
index 4a810e5911..8ae35dfba7 100644
--- a/Utility/Path/Max.hs
+++ b/Utility/Path/Max.hs
@@ -11,13 +11,13 @@
 module Utility.Path.Max where
 
 import System.FilePath
-import Data.List
-import Control.Applicative
-import Prelude
 
 #ifndef mingw32_HOST_OS
 import Utility.Exception
 import System.Posix.Files
+import Data.List
+import Control.Applicative
+import Prelude
 #endif
 
 {- Maximum size to use for a file in a specified directory.