diff --git a/servant-js/servant-js.cabal b/servant-js/servant-js.cabal
index 792fda22..adbed88d 100644
--- a/servant-js/servant-js.cabal
+++ b/servant-js/servant-js.cabal
@@ -42,6 +42,7 @@ library
                        Servant.JS.JQuery
                        Servant.JS.Vanilla
   build-depends:       base            >= 4.5 && <5
+                     , base-compat     >= 0.9
                      , charset         >= 0.3
                      , lens            >= 4
                      , servant-foreign == 0.5.*
@@ -83,6 +84,7 @@ test-suite spec
       Servant.JSSpec
       Servant.JSSpec.CustomHeaders
   build-depends:     base
+                   , base-compat
                    , hspec >= 2.1.8
                    , hspec-expectations
                    , language-ecmascript >= 0.16
diff --git a/servant-js/test/Servant/JSSpec.hs b/servant-js/test/Servant/JSSpec.hs
index 371d39db..ee3ff0a2 100644
--- a/servant-js/test/Servant/JSSpec.hs
+++ b/servant-js/test/Servant/JSSpec.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE DataKinds           #-}
 {-# LANGUAGE FlexibleInstances   #-}
 {-# LANGUAGE QuasiQuotes         #-}
@@ -7,18 +6,18 @@
 {-# LANGUAGE TypeOperators       #-}
 {-# LANGUAGE OverloadedStrings   #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
+
 module Servant.JSSpec where
 
 import           Data.Either                  (isRight)
-#if !MIN_VERSION_base(4,8,0)
-import           Data.Monoid                  ((<>),mconcat)
-#else
-import           Data.Monoid                  ((<>))
-#endif
+import           Data.Monoid                  ()
+import           Data.Monoid.Compat           ((<>))
 import           Data.Proxy
 import           Data.Text                    (Text)
 import qualified Data.Text                    as T
 import           Language.ECMAScript3.Parser  (program, parse)
+import           Prelude                      ()
+import           Prelude.Compat
 import           Test.Hspec  hiding (shouldContain, shouldNotContain)
 
 import           Servant.API.Internal.Test.ComprehensiveAPI
diff --git a/servant/src/Servant/Utils/Links.hs b/servant/src/Servant/Utils/Links.hs
index 1ada7c93..2fb7d0a5 100644
--- a/servant/src/Servant/Utils/Links.hs
+++ b/servant/src/Servant/Utils/Links.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP                    #-}
 {-# LANGUAGE ConstraintKinds        #-}
 {-# LANGUAGE DataKinds              #-}
 {-# LANGUAGE FlexibleInstances      #-}