diff --git a/Language/Haskell/GhcMod.hs b/Language/Haskell/GhcMod.hs
index e4710d4..b926cfe 100644
--- a/Language/Haskell/GhcMod.hs
+++ b/Language/Haskell/GhcMod.hs
@@ -24,16 +24,6 @@ module Language.Haskell.GhcMod (
   , debugInfo
   , rootInfo
   , packageDoc
-  -- * Converting the 'Ghc' monad to the 'IO' monad
-  , withGHC
-  , withGHCDummyFile
-  -- * 'Ghc' utilities
-  , browse
-  , check
-  , info
-  , typeOf
-  , modules
-  , lint
   ) where
 
 import Language.Haskell.GhcMod.Browse
@@ -41,7 +31,6 @@ import Language.Haskell.GhcMod.Check
 import Language.Haskell.GhcMod.Cradle
 import Language.Haskell.GhcMod.Debug
 import Language.Haskell.GhcMod.Flag
-import Language.Haskell.GhcMod.GHCApi
 import Language.Haskell.GhcMod.Info
 import Language.Haskell.GhcMod.Lang
 import Language.Haskell.GhcMod.Lint
diff --git a/Language/Haskell/GhcMod/Ghc.hs b/Language/Haskell/GhcMod/Ghc.hs
new file mode 100644
index 0000000..00b476e
--- /dev/null
+++ b/Language/Haskell/GhcMod/Ghc.hs
@@ -0,0 +1,19 @@
+module Language.Haskell.GhcMod.Ghc (
+  -- * Converting the 'Ghc' monad to the 'IO' monad
+    withGHC
+  , withGHCDummyFile
+  -- * 'Ghc' utilities
+  , browse
+  , check
+  , info
+  , typeOf
+  , modules
+  , lint
+  ) where
+
+import Language.Haskell.GhcMod.Browse
+import Language.Haskell.GhcMod.Check
+import Language.Haskell.GhcMod.GHCApi
+import Language.Haskell.GhcMod.Info
+import Language.Haskell.GhcMod.Lint
+import Language.Haskell.GhcMod.List
diff --git a/ghc-mod.cabal b/ghc-mod.cabal
index ed5d6f7..54904fe 100644
--- a/ghc-mod.cabal
+++ b/ghc-mod.cabal
@@ -46,6 +46,7 @@ Library
   Default-Language:     Haskell2010
   GHC-Options:          -Wall
   Exposed-Modules:      Language.Haskell.GhcMod
+                        Language.Haskell.GhcMod.Ghc
                         Language.Haskell.GhcMod.Internal
   Other-Modules:        Language.Haskell.GhcMod.Browse
                         Language.Haskell.GhcMod.CabalApi
diff --git a/src/GHCModi.hs b/src/GHCModi.hs
index c0492fc..505eabd 100644
--- a/src/GHCModi.hs
+++ b/src/GHCModi.hs
@@ -45,6 +45,7 @@ import GHC (Ghc, LoadHowMuch(LoadAllTargets), TargetId(TargetFile))
 import qualified GHC as G
 import HscTypes (SourceError)
 import Language.Haskell.GhcMod
+import Language.Haskell.GhcMod.Ghc
 import Language.Haskell.GhcMod.Internal
 import Paths_ghc_mod
 import System.Console.GetOpt