diff --git a/ghc/compiler/nativeGen/StixInteger.lhs b/ghc/compiler/nativeGen/StixInteger.lhs
index d4be4d50d13cdac31983d2c053e66b33a3ecc82b..eea3212026fd5607da1eb0c7f18c9949ecbc8e61 100644
--- a/ghc/compiler/nativeGen/StixInteger.lhs
+++ b/ghc/compiler/nativeGen/StixInteger.lhs
@@ -12,8 +12,11 @@ module StixInteger (
     ) where
 
 IMP_Ubiq(){-uitous-}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(NcgLoop)		( amodeToStix )
-
+#else
+import {-# SOURCE #-} StixPrim ( amodeToStix )
+#endif
 import MachMisc
 #if __GLASGOW_HASKELL__ >= 202
 import MachRegs hiding (Addr)
diff --git a/ghc/compiler/nativeGen/StixMacro.lhs b/ghc/compiler/nativeGen/StixMacro.lhs
index 5333c3c70e8d723c5d4be2a637b2b40c0b8cf1f7..58f9beb3ae348a6f3836c893ebe993eb4df60194 100644
--- a/ghc/compiler/nativeGen/StixMacro.lhs
+++ b/ghc/compiler/nativeGen/StixMacro.lhs
@@ -8,9 +8,15 @@
 module StixMacro ( macroCode, heapCheck ) where
 
 IMP_Ubiq(){-uitious-}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(NcgLoop)		( amodeToStix )
+#else
+import {-# SOURCE #-} StixPrim ( amodeToStix )
+#endif
 
 import MachMisc
+
+-- In 2.0x we import Addr via GlaExts, so we better hide the other one here.
 #if __GLASGOW_HASKELL__ >= 202
 import MachRegs hiding (Addr)
 #else
diff --git a/ghc/compiler/nativeGen/StixPrim.lhs b/ghc/compiler/nativeGen/StixPrim.lhs
index c7c4883abf0de0f2a7aefeb0754bf3081d087204..e4168a0f6d7e0a21ba082220d359d2541db501ad 100644
--- a/ghc/compiler/nativeGen/StixPrim.lhs
+++ b/ghc/compiler/nativeGen/StixPrim.lhs
@@ -8,7 +8,9 @@
 module StixPrim ( primCode, amodeToStix, amodeToStix' ) where
 
 IMP_Ubiq(){-uitous-}
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201
 IMPORT_DELOOPER(NcgLoop)		-- paranoia checking only
+#endif
 
 import MachMisc
 #if __GLASGOW_HASKELL__ >= 202
@@ -607,4 +609,3 @@ flushStdout = StCall SLIT("fflush") VoidRep [StLitLit SLIT("stdout")]
 flushStderr = StCall SLIT("fflush") VoidRep [StLitLit SLIT("stderr")]
 errorIO = StJump (StInd PtrRep (sStLitLbl SLIT("ErrorIO_innards")))
 \end{code}
-