1 files changed, 9 insertions, 3 deletions
diff --git a/src/compiler/GF.hs b/src/compiler/GF.hs
index bdb3e9b48..64c3184c6 100644
--- a/src/compiler/GF.hs
+++ b/src/compiler/GF.hs
@@ -1,8 +1,8 @@
 module GF(
            -- * Command line interface
            module GF.Main,
-           module GF.Compiler,
            module GF.Interactive,
+           module GF.Compiler,
 
            -- * Compiling GF grammars
            module GF.Compile,
@@ -11,7 +11,10 @@ module GF(
 
            -- * Abstract syntax, parsing and pretty printing
            module GF.Compile.GetGrammar,
-           module GF.Grammar,
+           module GF.Grammar.Grammar,
+           module GF.Grammar.Macros,
+           module GF.Grammar.Printer,
+           module GF.Infra.Ident,
 
            -- * Supporting infrastructure and system utilities
            module GF.Data.Operations,
@@ -28,7 +31,10 @@ import GF.CompileInParallel
 import GF.CompileOne
 
 import GF.Compile.GetGrammar
-import GF.Grammar
+import GF.Grammar.Grammar
+import GF.Grammar.Macros
+import GF.Grammar.Printer
+import GF.Infra.Ident
 
 import GF.Data.Operations
 import GF.Infra.Option