diff --git a/servant/servant.cabal b/servant/servant.cabal
index 27a7487e..e7d0231b 100644
--- a/servant/servant.cabal
+++ b/servant/servant.cabal
@@ -125,19 +125,19 @@ library
                   , ConstraintKinds
                   , DataKinds
                   , DeriveDataTypeable
+                  , DeriveGeneric
+                  , FlexibleContexts
                   , FlexibleInstances
                   , FunctionalDependencies
                   , GADTs
                   , KindSignatures
                   , MultiParamTypeClasses
-                  , OverlappingInstances
                   , OverloadedStrings
                   , PolyKinds
-                  , RecordWildCards
                   , ScopedTypeVariables
+                  , TupleSections
                   , TypeFamilies
                   , TypeOperators
-                  , TypeSynonymInstances
                   , UndecidableInstances
   ghc-options: -Wall -Wno-redundant-constraints