diff --git a/Database/MongoDB/Query.hs b/Database/MongoDB/Query.hs
index e9dd1e5..fb24f32 100644
--- a/Database/MongoDB/Query.hs
+++ b/Database/MongoDB/Query.hs
@@ -42,7 +42,8 @@ module Database.MongoDB.Query (
     MRResult, mapReduce, runMR, runMR',
     -- * Command
     Command, runCommand, runCommand1,
-    eval, retrieveServerData, updateMany, updateAll, UpdateResult
+    eval, retrieveServerData, updateMany, updateAll, UpdateResult,
+    UpdateOption(..)
 ) where
 
 import Prelude hiding (lookup)
diff --git a/mongoDB.cabal b/mongoDB.cabal
index eb15c53..3b41bb3 100644
--- a/mongoDB.cabal
+++ b/mongoDB.cabal
@@ -50,11 +50,11 @@ Library
   Exposed-modules:  Database.MongoDB
                     Database.MongoDB.Admin
                     Database.MongoDB.Connection
-                    Database.MongoDB.Internal.Protocol
-                    Database.MongoDB.Internal.Util
                     Database.MongoDB.Query
                     Database.MongoDB.Transport
                     Database.MongoDB.Transport.Tls
+  Other-modules:    Database.MongoDB.Internal.Protocol
+                    Database.MongoDB.Internal.Util
 
 Source-repository head
     Type:     git
diff --git a/test/QuerySpec.hs b/test/QuerySpec.hs
index 8fa3fb8..9591d45 100644
--- a/test/QuerySpec.hs
+++ b/test/QuerySpec.hs
@@ -6,7 +6,6 @@ import Data.String (IsString(..))
 import TestImport
 import Control.Exception
 import Control.Monad (forM_)
-import Database.MongoDB.Internal.Protocol (UpdateOption(..))
 import qualified Data.List as L
 
 import qualified Data.Text as T