diff --git a/src/compiler/GF/Command/Abstract.hs b/src/compiler/GF/Command/Abstract.hs
index 1f7c4014e..5469f12ac 100644
--- a/src/compiler/GF/Command/Abstract.hs
+++ b/src/compiler/GF/Command/Abstract.hs
@@ -1,7 +1,7 @@
 module GF.Command.Abstract where
 
-import PGF.CId
-import PGF.Data
+import PGF.CId(CId,mkCId)
+import PGF.Data(Expr)
 
 type Ident = String
 
diff --git a/src/compiler/GF/Compile/GeneratePMCFG.hs b/src/compiler/GF/Compile/GeneratePMCFG.hs
index 175246a52..0dcb8c8cd 100644
--- a/src/compiler/GF/Compile/GeneratePMCFG.hs
+++ b/src/compiler/GF/Compile/GeneratePMCFG.hs
@@ -14,7 +14,7 @@ module GF.Compile.GeneratePMCFG
     ) where
 
 import PGF.CId
-import PGF.Data hiding (Type, Production)
+import PGF.Data(Alternative(..),CncCat(..),Symbol(..),fidVar)
 
 import GF.Infra.Option
 import GF.Grammar hiding (Env, mkRecord, mkTable)