6 files changed, 8 insertions, 6 deletions
diff --git a/compiler/utils/GraphBase.hs b/compiler/utils/GraphBase.hs
index 04eda96120..3948c81a6a 100644
--- a/compiler/utils/GraphBase.hs
+++ b/compiler/utils/GraphBase.hs
@@ -14,7 +14,7 @@ module GraphBase (
 where
 
 import UniqSet
-import UniqFM
+import LazyUniqFM
 
 
 -- | A fn to check if a node is trivially colorable
diff --git a/compiler/utils/GraphColor.hs b/compiler/utils/GraphColor.hs
index 8e7989dc8c..e381fbf7f6 100644
--- a/compiler/utils/GraphColor.hs
+++ b/compiler/utils/GraphColor.hs
@@ -19,7 +19,7 @@ import GraphOps
 import GraphPpr
 
 import Unique
-import UniqFM
+import LazyUniqFM
 import UniqSet
 import Outputable	
 
diff --git a/compiler/utils/GraphOps.hs b/compiler/utils/GraphOps.hs
index 880f3c65cd..a82ff68629 100644
--- a/compiler/utils/GraphOps.hs
+++ b/compiler/utils/GraphOps.hs
@@ -24,7 +24,7 @@ import GraphBase
 import Outputable
 import Unique
 import UniqSet
-import UniqFM
+import LazyUniqFM
 
 import Data.List	hiding (union)
 import Data.Maybe
diff --git a/compiler/utils/GraphPpr.hs b/compiler/utils/GraphPpr.hs
index 1df5158dc2..0e82b319eb 100644
--- a/compiler/utils/GraphPpr.hs
+++ b/compiler/utils/GraphPpr.hs
@@ -12,7 +12,7 @@ import GraphBase
 import Outputable
 import Unique
 import UniqSet
-import UniqFM
+import LazyUniqFM
 
 import Data.List
 import Data.Maybe
diff --git a/compiler/utils/LazyUniqFM.lhs b/compiler/utils/LazyUniqFM.lhs
index d8132e3cd5..b7ac15d2a1 100644
--- a/compiler/utils/LazyUniqFM.lhs
+++ b/compiler/utils/LazyUniqFM.lhs
@@ -13,7 +13,9 @@ Basically, the things need to be in class @Uniquable@, and we use the
 \begin{code}
 {-# OPTIONS -Wall -fno-warn-name-shadowing -Werror -fallow-undecidable-instances #-}
 module LazyUniqFM (
-	UniqFM,   	-- abstract type
+	UniqFM(..),   	-- abstract type
+    -- XXX Not actually abstract because of nativeGen/MachRegs; sigh
+    Lazy(Lazy), -- XXX Also for nativeGen/MachRegs; sigh
 
 	emptyUFM,
 	unitUFM,
diff --git a/compiler/utils/UniqSet.lhs b/compiler/utils/UniqSet.lhs
index 08d35758a5..ba312dd198 100644
--- a/compiler/utils/UniqSet.lhs
+++ b/compiler/utils/UniqSet.lhs
@@ -22,7 +22,7 @@ module UniqSet (
     ) where
 
 import Maybes
-import UniqFM
+import LazyUniqFM
 import Unique
 
 #if ! OMIT_NATIVE_CODEGEN