diff --git a/servant-server/example/greet.hs b/servant-server/example/greet.hs
index 5d95ddca..0b994cd3 100644
--- a/servant-server/example/greet.hs
+++ b/servant-server/example/greet.hs
@@ -18,7 +18,6 @@ import           Network.Wai.Handler.Warp
 
 import           Servant
 import           Servant.Server.Generic ()
-import           Servant.API.Generic
 
 -- * Example
 
diff --git a/servant/src/Servant/API.hs b/servant/src/Servant/API.hs
index de4b805c..22309dce 100644
--- a/servant/src/Servant/API.hs
+++ b/servant/src/Servant/API.hs
@@ -38,6 +38,7 @@ module Servant.API (
 
   -- * Sub-APIs defined as records of routes
   module Servant.API.NamedRoutes,
+  module Servant.API.Generic,
 
   -- * Streaming endpoints, distinguished by HTTP method
   module Servant.API.Stream,
@@ -102,6 +103,9 @@ import           Servant.API.Fragment
                  (Fragment)
 import           Servant.API.Header
                  (Header, Header')
+import           Servant.API.Generic
+                 (GenericMode ((:-)), AsApi, ToServant, ToServantApi, GServantProduct,
+                 GenericServant, fromServant, toServant, genericApi)
 import           Servant.API.HttpVersion
                  (HttpVersion (..))
 import           Servant.API.IsSecure