diff --git a/relational-query/src/Database/Relational/Query/Monad/Assign.hs b/relational-query/src/Database/Relational/Query/Monad/Assign.hs
index 8a0f1525..cef67637 100644
--- a/relational-query/src/Database/Relational/Query/Monad/Assign.hs
+++ b/relational-query/src/Database/Relational/Query/Monad/Assign.hs
@@ -21,8 +21,8 @@ module Database.Relational.Query.Monad.Assign (
 
 import Database.Relational.Query.Internal.BaseSQL (Assignment)
 import Database.Relational.Query.Internal.Config (Config)
-import Database.Relational.Query.Internal.Sub (QueryRestriction)
 
+import Database.Relational.Query.Sub (QueryRestriction)
 import Database.Relational.Query.Context (Flat)
 import Database.Relational.Query.Table (Table)
 import Database.Relational.Query.Projection (Projection)
diff --git a/relational-query/src/Database/Relational/Query/Monad/Restrict.hs b/relational-query/src/Database/Relational/Query/Monad/Restrict.hs
index 6aadff78..efe6cc80 100644
--- a/relational-query/src/Database/Relational/Query/Monad/Restrict.hs
+++ b/relational-query/src/Database/Relational/Query/Monad/Restrict.hs
@@ -21,8 +21,8 @@ module Database.Relational.Query.Monad.Restrict (
   ) where
 
 import Database.Relational.Query.Internal.Config (Config)
-import Database.Relational.Query.Internal.Sub (QueryRestriction)
 
+import Database.Relational.Query.Sub (QueryRestriction)
 import Database.Relational.Query.Context (Flat)
 import Database.Relational.Query.Projection (Projection)
 import Database.Relational.Query.Monad.Trans.Restricting
diff --git a/relational-query/src/Database/Relational/Query/Monad/Trans/JoinState.hs b/relational-query/src/Database/Relational/Query/Monad/Trans/JoinState.hs
index aab8123a..b9f016ff 100644
--- a/relational-query/src/Database/Relational/Query/Monad/Trans/JoinState.hs
+++ b/relational-query/src/Database/Relational/Query/Monad/Trans/JoinState.hs
@@ -9,6 +9,8 @@
 --
 -- This module provides state definition for
 -- "Database.Relational.Query.Monad.Trans.Join".
+--
+-- This is not public interface.
 module Database.Relational.Query.Monad.Trans.JoinState (
   -- * Join context
   JoinContext, primeJoinContext, updateProduct, joinProduct
diff --git a/relational-query/src/Database/Relational/Query/Monad/Trans/Qualify.hs b/relational-query/src/Database/Relational/Query/Monad/Trans/Qualify.hs
index 93ea5aaa..fe64a601 100644
--- a/relational-query/src/Database/Relational/Query/Monad/Trans/Qualify.hs
+++ b/relational-query/src/Database/Relational/Query/Monad/Trans/Qualify.hs
@@ -10,6 +10,8 @@
 -- Portability : unknown
 --
 -- This module defines monad transformer which qualify uniquely SQL table forms.
+--
+-- This is not public interface.
 module Database.Relational.Query.Monad.Trans.Qualify (
   -- * Qualify monad
   Qualify, qualify,
diff --git a/relational-query/src/Database/Relational/Query/Monad/Trans/Restricting.hs b/relational-query/src/Database/Relational/Query/Monad/Trans/Restricting.hs
index 1b4cf12a..67541637 100644
--- a/relational-query/src/Database/Relational/Query/Monad/Trans/Restricting.hs
+++ b/relational-query/src/Database/Relational/Query/Monad/Trans/Restricting.hs
@@ -26,8 +26,7 @@ import Control.Applicative (Applicative, pure, (<$>))
 import Control.Arrow (second)
 import Data.DList (DList, toList)
 
-import Database.Relational.Query.Internal.Sub (QueryRestriction, Projection)
-
+import Database.Relational.Query.Sub (QueryRestriction, Projection)
 import Database.Relational.Query.Monad.Class
   (MonadQualify (..), MonadRestrict(..), MonadQuery (..), MonadAggregate(..))
 
diff --git a/relational-query/src/Database/Relational/Query/Monad/Type.hs b/relational-query/src/Database/Relational/Query/Monad/Type.hs
index 2819ec60..8af0fb54 100644
--- a/relational-query/src/Database/Relational/Query/Monad/Type.hs
+++ b/relational-query/src/Database/Relational/Query/Monad/Type.hs
@@ -15,8 +15,8 @@ module Database.Relational.Query.Monad.Type
        ) where
 
 import Database.Relational.Query.Internal.BaseSQL (Duplication)
-import Database.Relational.Query.Internal.Sub (JoinProduct, QueryRestriction)
 
+import Database.Relational.Query.Sub (JoinProduct, QueryRestriction)
 import Database.Relational.Query.Context (Flat)
 import Database.Relational.Query.Projection (Projection)
 import Database.Relational.Query.Projectable (PlaceHolders)
diff --git a/relational-query/src/Database/Relational/Query/Projectable.hs b/relational-query/src/Database/Relational/Query/Projectable.hs
index f2c51114..02de5532 100644
--- a/relational-query/src/Database/Relational/Query/Projectable.hs
+++ b/relational-query/src/Database/Relational/Query/Projectable.hs
@@ -78,8 +78,8 @@ import Database.Record
    HasColumnConstraint, NotNull)
 
 import Database.Relational.Query.Internal.SQL (StringSQL, stringSQL, showStringSQL)
-import Database.Relational.Query.Context (Flat, Aggregated, Exists, OverWindow)
 
+import Database.Relational.Query.Context (Flat, Aggregated, Exists, OverWindow)
 import Database.Relational.Query.Pure
   (ShowConstantTermsSQL, showConstantTermsSQL', ProductConstructor (..))
 import Database.Relational.Query.Pi (Pi)