diff --git a/servant-docs/src/Servant/Docs/Internal.hs b/servant-docs/src/Servant/Docs/Internal.hs
index 09bf8b40..d15ccec6 100644
--- a/servant-docs/src/Servant/Docs/Internal.hs
+++ b/servant-docs/src/Servant/Docs/Internal.hs
@@ -22,18 +22,20 @@ module Servant.Docs.Internal where
 #if !MIN_VERSION_base(4,8,0)
 import           Control.Applicative
 #endif
-import           Control.Lens
+import           Control.Lens               (makeLenses, over, traversed, (%~),
+                                             (&), (.~), (<>~), (^.), _1, _2,
+                                             _last, (|>))
+import           Data.ByteString.Conversion (ToByteString, toByteString)
 import           Data.ByteString.Lazy.Char8 (ByteString)
 import qualified Data.CaseInsensitive       as CI
-import           Data.Hashable
+import           Data.Hashable              (Hashable)
 import           Data.HashMap.Strict        (HashMap)
 import           Data.List
 import           Data.Maybe
 import           Data.Monoid
 import           Data.Ord                   (comparing)
-import           Data.Proxy
-import           Data.ByteString.Conversion (ToByteString, toByteString)
-import           Data.String.Conversions
+import           Data.Proxy                 (Proxy(Proxy))
+import           Data.String.Conversions    (cs)
 import           Data.Text                  (Text, pack, unpack)
 import           GHC.Exts                   (Constraint)
 import           GHC.Generics
diff --git a/servant-jquery/src/Servant/JQuery/Internal.hs b/servant-jquery/src/Servant/JQuery/Internal.hs
index 15810a2f..1bee07e6 100644
--- a/servant-jquery/src/Servant/JQuery/Internal.hs
+++ b/servant-jquery/src/Servant/JQuery/Internal.hs
@@ -11,19 +11,20 @@
 module Servant.JQuery.Internal where
 
 #if !MIN_VERSION_base(4,8,0)
-import Control.Applicative
+import           Control.Applicative
 #endif
-import Control.Lens
-import Data.Char (toLower)
-import qualified Data.CharSet as Set
+import           Control.Lens                  (makeLenses, (%~), (&), (.~)
+                                               , (<>~), (^.), _last)
+import           Data.Char                     (toLower)
+import qualified Data.CharSet                  as Set
 import qualified Data.CharSet.Unicode.Category as Set
-import Data.List
-import Data.Monoid
-import Data.Proxy
-import qualified Data.Text as T
-import GHC.Exts (Constraint)
-import GHC.TypeLits
-import Servant.API
+import           Data.List
+import           Data.Monoid
+import           Data.Proxy
+import qualified Data.Text                     as T
+import           GHC.Exts                      (Constraint)
+import           GHC.TypeLits
+import           Servant.API
 
 type Arg = String