diff --git a/servant-examples/auth-combinator/auth-combinator.hs b/servant-examples/auth-combinator/auth-combinator.hs
index 26cc0475..c82510f3 100644
--- a/servant-examples/auth-combinator/auth-combinator.hs
+++ b/servant-examples/auth-combinator/auth-combinator.hs
@@ -5,7 +5,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies        #-}
 {-# LANGUAGE TypeOperators       #-}
-{-# OPTIONS_GHC -fno-warn-unused-binds #-}
 import           Data.Aeson
 import           Data.ByteString          (ByteString)
 import           Data.Text                (Text)
diff --git a/servant-examples/hackage/hackage.hs b/servant-examples/hackage/hackage.hs
index 685974cc..81d18883 100644
--- a/servant-examples/hackage/hackage.hs
+++ b/servant-examples/hackage/hackage.hs
@@ -2,7 +2,6 @@
 {-# LANGUAGE DeriveGeneric     #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TypeOperators     #-}
-{-# OPTIONS_GHC -fno-warn-unused-binds #-}
 {-# OPTIONS_GHC -fno-warn-unused-imports #-}
 import           Control.Applicative
 import           Control.Monad
diff --git a/servant-examples/servant-examples.cabal b/servant-examples/servant-examples.cabal
index 9c8cfaca..a722cf49 100644
--- a/servant-examples/servant-examples.cabal
+++ b/servant-examples/servant-examples.cabal
@@ -20,7 +20,7 @@ source-repository head
 executable tutorial
   main-is: tutorial.hs
   other-modules: T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
-  ghc-options: -Wall -fno-warn-unused-binds -fno-warn-name-shadowing
+  ghc-options: -Wall -fno-warn-unused-binds -fno-warn-name-shadowing -fno-warn-orphans -fno-warn-unused-imports
   build-depends:
       aeson >= 0.8
     , base >= 4.7 && < 5
@@ -89,6 +89,7 @@ executable wai-middleware
 
 executable auth-combinator
   main-is: auth-combinator.hs
+  ghc-options: -Wall -fno-warn-unused-binds -fno-warn-name-shadowing
   build-depends:
       aeson >= 0.8
     , base >= 4.7 && < 5
@@ -104,6 +105,7 @@ executable auth-combinator
 
 executable socket-io-chat
   main-is: socket-io-chat.hs
+  ghc-options: -Wall -fno-warn-unused-binds -fno-warn-name-shadowing
   other-modules: Chat
   build-depends:
       aeson >= 0.8
diff --git a/servant-examples/tutorial/T3.hs b/servant-examples/tutorial/T3.hs
index 09c9c2ae..7b5bdeb3 100644
--- a/servant-examples/tutorial/T3.hs
+++ b/servant-examples/tutorial/T3.hs
@@ -2,7 +2,6 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE TypeFamilies  #-}
 {-# LANGUAGE TypeOperators #-}
-{-# OPTIONS_GHC -fno-warn-unused-binds #-}
 module T3 where
 
 import           Control.Monad.Trans.Except
diff --git a/servant-examples/tutorial/T8.hs b/servant-examples/tutorial/T8.hs
index c0f8b691..68d52467 100644
--- a/servant-examples/tutorial/T8.hs
+++ b/servant-examples/tutorial/T8.hs
@@ -4,7 +4,6 @@
 module T8 where
 
 import           Control.Monad.Trans.Except
-import           Data.Aeson
 import           Servant
 import           Servant.Client
 
diff --git a/servant-examples/tutorial/T9.hs b/servant-examples/tutorial/T9.hs
index 08545228..365f6e54 100644
--- a/servant-examples/tutorial/T9.hs
+++ b/servant-examples/tutorial/T9.hs
@@ -13,7 +13,6 @@ import           GHC.Generics
 import           Network.Wai
 import           Servant
 import           Servant.JS
-import           Servant.JS.JQuery
 import           System.Random
 
 import qualified Data.Text                  as T
diff --git a/stack.yaml b/stack.yaml
index ed418ce5..006f455c 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,8 +1,6 @@
 flags:
   servant-js:
     example: false
-ghc-options:
-    "*": -Wall
 packages:
 - servant/
 - servant-blaze/