3 files changed, 4 insertions, 5 deletions
diff --git a/src/compiler/GF/Grammar/Binary.hs b/src/compiler/GF/Grammar/Binary.hs
index 7b4540ce5..ad9df8b92 100644
--- a/src/compiler/GF/Grammar/Binary.hs
+++ b/src/compiler/GF/Grammar/Binary.hs
@@ -13,7 +13,7 @@ import Prelude hiding (catch)
 import Control.Exception(catch,ErrorCall(..),throwIO)
 
 --import Data.Char
-import Data.Binary
+import PGF.Internal(Binary(..),Word8,putWord8,getWord8,encodeFile,decodeFile)
 --import Control.Monad
 import qualified Data.Map as Map
 import qualified Data.ByteString.Char8 as BS
@@ -24,7 +24,7 @@ import GF.Infra.Option
 import GF.Grammar.Grammar
 
 import PGF() -- Binary instances
-import PGF.Data(Literal(..))
+import PGF.Internal(Literal(..))
 
 -- Please change this every time when the GFO format is changed
 gfoVersion = "GF03"
diff --git a/src/compiler/GF/Grammar/Grammar.hs b/src/compiler/GF/Grammar/Grammar.hs
index 2fdab29c7..df60c7c54 100644
--- a/src/compiler/GF/Grammar/Grammar.hs
+++ b/src/compiler/GF/Grammar/Grammar.hs
@@ -66,7 +66,7 @@ import GF.Infra.Option ---
 
 import GF.Data.Operations
 
-import PGF.Data (FId, FunId, SeqId, LIndex, Sequence, BindType(..))
+import PGF.Internal (FId, FunId, SeqId, LIndex, Sequence, BindType(..))
 
 --import Data.List
 import Data.Array.IArray
diff --git a/src/compiler/GF/Grammar/Printer.hs b/src/compiler/GF/Grammar/Printer.hs
index 14a87b45a..6138f2ab9 100644
--- a/src/compiler/GF/Grammar/Printer.hs
+++ b/src/compiler/GF/Grammar/Printer.hs
@@ -29,8 +29,7 @@ import GF.Infra.Option
 import GF.Grammar.Values
 import GF.Grammar.Grammar
 
-import PGF.Data (ppMeta, ppLit)
-import PGF.Printer (ppFId, ppFunId, ppSeqId, ppSeq)
+import PGF.Internal (ppMeta, ppLit, ppFId, ppFunId, ppSeqId, ppSeq)
 
 import Text.PrettyPrint
 import Data.Maybe (isNothing)