diff --git a/src/Servant/API.hs b/src/Servant/API.hs
index 67064ec7..78b327a2 100644
--- a/src/Servant/API.hs
+++ b/src/Servant/API.hs
@@ -37,16 +37,16 @@ module Servant.API (
   module Servant.Utils.Links,
   ) where
 
-import Servant.API.Alternative
-import Servant.API.Capture
-import Servant.API.Delete
-import Servant.API.Get
-import Servant.API.Header
-import Servant.API.Post
-import Servant.API.Put
-import Servant.API.QueryParam
-import Servant.API.Raw
-import Servant.API.ReqBody
-import Servant.API.Sub
-import Servant.QQ (sitemap)
-import Servant.Utils.Links (mkLink)
+import Servant.API.Alternative ( (:<|>)(..) )
+import Servant.API.Capture ( Capture )
+import Servant.API.Delete ( Delete )
+import Servant.API.Get ( Get )
+import Servant.API.Header ( Header )
+import Servant.API.Post ( Post )
+import Servant.API.Put ( Put )
+import Servant.API.QueryParam ( QueryFlag, QueryParams, QueryParam )
+import Servant.API.Raw ( Raw )
+import Servant.API.ReqBody ( ReqBody )
+import Servant.API.Sub ( (:>)(..) )
+import Servant.QQ ( sitemap )
+import Servant.Utils.Links ( mkLink )
diff --git a/src/Servant/API/Delete.hs b/src/Servant/API/Delete.hs
index 7de045db..394b11c9 100644
--- a/src/Servant/API/Delete.hs
+++ b/src/Servant/API/Delete.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 module Servant.API.Delete where
 
-import Data.Typeable
+import Data.Typeable ( Typeable )
 
 -- | Combinator for DELETE requests.
 --
diff --git a/src/Servant/API/Get.hs b/src/Servant/API/Get.hs
index 65a3235a..37cb5bf4 100644
--- a/src/Servant/API/Get.hs
+++ b/src/Servant/API/Get.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 module Servant.API.Get where
 
-import Data.Typeable
+import Data.Typeable ( Typeable )
 
 -- | Endpoint for simple GET requests. Serves the result as JSON.
 --
diff --git a/src/Servant/API/Header.hs b/src/Servant/API/Header.hs
index 5dc25e17..06344524 100644
--- a/src/Servant/API/Header.hs
+++ b/src/Servant/API/Header.hs
@@ -1,8 +1,6 @@
 {-# LANGUAGE PolyKinds #-}
 module Servant.API.Header where
 
-import GHC.TypeLits
-
 -- | Extract the given header's value as a value of type @a@.
 --
 -- Example:
diff --git a/src/Servant/API/Post.hs b/src/Servant/API/Post.hs
index 51863ade..fa57f261 100644
--- a/src/Servant/API/Post.hs
+++ b/src/Servant/API/Post.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 module Servant.API.Post where
 
-import Data.Typeable
+import Data.Typeable ( Typeable )
 
 -- | Endpoint for POST requests. The type variable represents the type of the
 -- response body (not the request body, use 'Servant.API.ReqBody.ReqBody' for
diff --git a/src/Servant/API/Put.hs b/src/Servant/API/Put.hs
index d423caaa..201cce8d 100644
--- a/src/Servant/API/Put.hs
+++ b/src/Servant/API/Put.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 module Servant.API.Put where
 
-import Data.Typeable
+import Data.Typeable ( Typeable )
 
 -- | Endpoint for PUT requests, usually used to update a ressource.
 -- The type @a@ is the type of the response body that's returned.
diff --git a/src/Servant/API/Sub.hs b/src/Servant/API/Sub.hs
index d7bfc2ba..2d32dff2 100644
--- a/src/Servant/API/Sub.hs
+++ b/src/Servant/API/Sub.hs
@@ -2,8 +2,7 @@
 {-# LANGUAGE TypeOperators #-}
 module Servant.API.Sub where
 
-import Data.Proxy
-import GHC.TypeLits
+import Data.Proxy ( Proxy )
 
 -- | The contained API (second argument) can be found under @("/" ++ path)@
 -- (path being the first argument).
diff --git a/src/Servant/Common/Text.hs b/src/Servant/Common/Text.hs
index facac1ec..5ba1fa94 100644
--- a/src/Servant/Common/Text.hs
+++ b/src/Servant/Common/Text.hs
@@ -6,11 +6,11 @@ module Servant.Common.Text
   , ToText(..)
   ) where
 
-import Data.String.Conversions
-import Data.Int
-import Data.Text
-import Data.Text.Read
-import Data.Word
+import Data.String.Conversions ( cs )
+import Data.Int ( Int8, Int16, Int32, Int64 )
+import Data.Text ( Text )
+import Data.Text.Read ( rational, signed, decimal, Reader )
+import Data.Word ( Word, Word8, Word16, Word32, Word64 )
 
 -- | For getting values from url captures and query string parameters
 class FromText a where
diff --git a/src/Servant/QQ.hs b/src/Servant/QQ.hs
index f6331f54..71c8d5af 100644
--- a/src/Servant/QQ.hs
+++ b/src/Servant/QQ.hs
@@ -28,21 +28,39 @@
 -- Note the @/@ before a @QueryParam@!
 module Servant.QQ (sitemap) where
 
-import Control.Monad (void)
-import Control.Applicative hiding (many, (<|>), optional)
-import Language.Haskell.TH.Quote
+import Control.Monad ( void )
+import Control.Applicative ( (<$>) )
+import Language.Haskell.TH.Quote ( QuasiQuoter(..) )
 import Language.Haskell.TH
+    ( mkName, Type(AppT, ConT, LitT), TyLit(StrTyLit) )
 import Text.ParserCombinators.Parsec
-
-import Servant.API.Capture
-import Servant.API.Get
-import Servant.API.Post
-import Servant.API.Put
-import Servant.API.Delete
-import Servant.API.QueryParam
-import Servant.API.ReqBody
-import Servant.API.Sub
-import Servant.API.Alternative
+    ( try,
+      Parser,
+      manyTill,
+      endBy,
+      sepBy1,
+      optional,
+      optionMaybe,
+      string,
+      anyChar,
+      char,
+      spaces,
+      noneOf,
+      parse,
+      skipMany,
+      many,
+      lookAhead,
+      (<|>),
+      (<?>) )
+import Servant.API.Capture ( Capture )
+import Servant.API.Get ( Get )
+import Servant.API.Post ( Post )
+import Servant.API.Put ( Put )
+import Servant.API.Delete ( Delete )
+import Servant.API.QueryParam ( QueryParam )
+import Servant.API.ReqBody ( ReqBody )
+import Servant.API.Sub ( (:>) )
+import Servant.API.Alternative ( (:<|>) )
 
 -- | Finally-tagless encoding for our DSL.
 -- Keeping 'repr'' and 'repr' distinct when writing functions with an
@@ -195,4 +213,3 @@ sitemap = QuasiQuoter { quoteExp = undefined
                             Right st -> return st
                       , quoteDec = undefined
                       }
-
diff --git a/src/Servant/Utils/Links.hs b/src/Servant/Utils/Links.hs
index f2f4fe82..3be24844 100644
--- a/src/Servant/Utils/Links.hs
+++ b/src/Servant/Utils/Links.hs
@@ -48,18 +48,18 @@ module Servant.Utils.Links (
     , IsLink
                            )where
 
-import Data.Proxy
-import GHC.TypeLits
+import Data.Proxy ( Proxy(..) )
+import GHC.TypeLits ( KnownSymbol, Symbol, symbolVal )
 
-import Servant.API.Capture
-import Servant.API.ReqBody
-import Servant.API.QueryParam
-import Servant.API.Get
-import Servant.API.Post
-import Servant.API.Put
-import Servant.API.Delete
-import Servant.API.Sub
-import Servant.API.Alternative
+import Servant.API.Capture ( Capture )
+import Servant.API.ReqBody ( ReqBody )
+import Servant.API.QueryParam ( QueryParam )
+import Servant.API.Get ( Get )
+import Servant.API.Post ( Post )
+import Servant.API.Put ( Put )
+import Servant.API.Delete ( Delete )
+import Servant.API.Sub ( type (:>) )
+import Servant.API.Alternative ( type (:<|>) )
 
 
 type family Or a b where
@@ -123,4 +123,3 @@ instance VLinkHelper (Get x) where
 
 instance VLinkHelper (Post x) where
     vlh _ = ""
-
diff --git a/test/Servant/QQSpec.hs b/test/Servant/QQSpec.hs
index adf59611..837ab806 100644
--- a/test/Servant/QQSpec.hs
+++ b/test/Servant/QQSpec.hs
@@ -9,9 +9,18 @@
 {-# LANGUAGE UndecidableInstances  #-}
 module Servant.QQSpec where
 
-import Test.Hspec
+import Test.Hspec ( Expectation, Spec, shouldBe, it, describe )
 
 import Servant.API
+    ( (:<|>),
+      ReqBody,
+      QueryParam,
+      Put,
+      Get,
+      Post,
+      Capture,
+      (:>),
+      sitemap )
 
 --------------------------------------------------------------------------
 -- Types for testing
diff --git a/test/Servant/Utils/LinksSpec.hs b/test/Servant/Utils/LinksSpec.hs
index 3f16d71b..2eb43744 100644
--- a/test/Servant/Utils/LinksSpec.hs
+++ b/test/Servant/Utils/LinksSpec.hs
@@ -3,11 +3,13 @@
 {-# LANGUAGE TypeOperators #-}
 module Servant.Utils.LinksSpec where
 
-import Test.Hspec
+import Test.Hspec ( Spec, it, describe )
 
 import Servant.API
+    ( type (:<|>), ReqBody, QueryParam, Get, Post, Capture, type (:>) )
 import Servant.QQSpec ( (~>) )
-import Servant.Utils.Links (IsElem, IsLink)
+import Servant.Utils.Links ( IsElem, IsLink )
+
 
 type TestApi =
        "hello" :> Capture "name" String :> QueryParam "capital" Bool :> Get Bool
@@ -49,4 +51,3 @@ isLink = describe "IsLink" $ do
     it "is False of anything with captures" $ do
         reflected (Proxy::Proxy (IsLink NotALink)) ~> False
         reflected (Proxy::Proxy (IsLink NotALink2)) ~> False
-