diff --git a/servant-client-core/src/Servant/Client/Core/Internal/HasClient.hs b/servant-client-core/src/Servant/Client/Core/Internal/HasClient.hs
index fe65b05f..bd407ed6 100644
--- a/servant-client-core/src/Servant/Client/Core/Internal/HasClient.hs
+++ b/servant-client-core/src/Servant/Client/Core/Internal/HasClient.hs
@@ -14,15 +14,16 @@
 #include "overlapping-compat.h"
 module Servant.Client.Core.Internal.HasClient where
 
+import           Prelude                                ()
 import           Prelude.Compat
-import           Prelude                              ()
 
 import           Control.Monad.Error.Class              (throwError)
+import           Data.Foldable                          (toList)
 import           Data.List                              (foldl')
 import           Data.Proxy                             (Proxy (Proxy))
+import           Data.Sequence                          (fromList)
 import           Data.String                            (fromString)
 import           Data.Text                              (pack)
-import           GHC.Exts                               (fromList, toList)
 import           GHC.TypeLits                           (KnownSymbol, symbolVal)
 import qualified Network.HTTP.Types                     as H
 import           Servant.API                            ((:<|>) ((:<|>)), (:>),
diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal
index 535a80d0..36edb205 100644
--- a/servant-client/servant-client.cabal
+++ b/servant-client/servant-client.cabal
@@ -37,7 +37,8 @@ library
     , bytestring            >= 0.10     && < 0.11
     , aeson                 >= 0.7      && < 1.3
     , attoparsec            >= 0.12     && < 0.14
-    , http-client           >= 0.4.18.1 && < 0.6
+    , containers            >= 0.5      && < 0.6
+    , http-client           >= 0.4.30   && < 0.6
     , http-client-tls       >= 0.2.2    && < 0.4
     , http-media            >= 0.6.2    && < 0.8
     , http-types            >= 0.8.6    && < 0.10
diff --git a/servant-client/src/Servant/Client/Internal/HttpClient.hs b/servant-client/src/Servant/Client/Internal/HttpClient.hs
index 0236b492..5595c039 100644
--- a/servant-client/src/Servant/Client/Internal/HttpClient.hs
+++ b/servant-client/src/Servant/Client/Internal/HttpClient.hs
@@ -30,9 +30,9 @@ import           Data.Foldable               (toList)
 import           Data.Functor.Alt            (Alt (..))
 import           Data.Monoid                 ((<>))
 import           Data.Proxy                  (Proxy (..))
+import           Data.Sequence               (fromList)
 import           Data.String                 (fromString)
 import qualified Data.Text                   as T
-import           GHC.Exts                    (fromList)
 import           GHC.Generics
 import           Network.HTTP.Media          (renderHeader)
 import           Network.HTTP.Types          (hContentType, renderQuery,
diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal
index c9210354..efb8f29b 100644
--- a/servant-server/servant-server.cabal
+++ b/servant-server/servant-server.cabal
@@ -164,5 +164,3 @@ test-suite doctests
  if impl(ghc >= 8.2)
    x-doctest-options: -fdiagnostics-color=never
  include-dirs: include
- other-modules:
-   Build_doctests
diff --git a/stack-ghc-7.8.4.yaml b/stack-ghc-7.8.4.yaml
index 479a6d20..97049725 100644
--- a/stack-ghc-7.8.4.yaml
+++ b/stack-ghc-7.8.4.yaml
@@ -20,6 +20,7 @@ extra-deps:
 - hspec-expectations-0.8.2
 - hspec-wai-0.8.0
 - http-api-data-0.3.6
+- http-client-0.4.30
 - natural-transformation-0.4
 - primitive-0.6.1.0
 - servant-js-0.9.3