diff --git a/XMonad/Actions/SwapPromote.hs b/XMonad/Actions/SwapPromote.hs
index 8256c4ef..e8fc41aa 100644
--- a/XMonad/Actions/SwapPromote.hs
+++ b/XMonad/Actions/SwapPromote.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE DeriveDataTypeable #-}
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  XMonad.Actions.SwapPromote
@@ -63,6 +65,7 @@ import qualified Data.Set                       as S
 import           Data.List
 import           Data.Maybe
 import           Control.Arrow
+import           Control.Applicative ((<$>),(<*>))
 import           Control.Monad
 
 
diff --git a/XMonad/Layout/NoBorders.hs b/XMonad/Layout/NoBorders.hs
index b7f73fa1..0997ed69 100644
--- a/XMonad/Layout/NoBorders.hs
+++ b/XMonad/Layout/NoBorders.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE FlexibleContexts, FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
-{-# LANGUAGE PatternGuards #-}
+{-# LANGUAGE FlexibleContexts, FlexibleInstances, MultiParamTypeClasses #-}
+{-# LANGUAGE TypeSynonymInstances, PatternGuards, DeriveDataTypeable #-}
 
 -----------------------------------------------------------------------------
 -- |
@@ -42,6 +42,7 @@ import           Data.List
 import           Data.Monoid
 import qualified Data.Map                       as M
 import           Data.Function                  (on)
+import           Control.Applicative            ((<$>),(<*>),pure)
 import           Control.Monad                  (guard)
 
 
diff --git a/XMonad/Layout/Spacing.hs b/XMonad/Layout/Spacing.hs
index c103c356..e4efdd10 100644
--- a/XMonad/Layout/Spacing.hs
+++ b/XMonad/Layout/Spacing.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-}
+{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, DeriveDataTypeable #-}
 
 -----------------------------------------------------------------------------
 -- |
diff --git a/XMonad/Layout/StateFull.hs b/XMonad/Layout/StateFull.hs
index 476255e5..ceacad1c 100644
--- a/XMonad/Layout/StateFull.hs
+++ b/XMonad/Layout/StateFull.hs
@@ -34,7 +34,7 @@ import qualified XMonad.StackSet as W
 import XMonad.Util.Stack (findZ)
 
 import Data.Maybe (fromMaybe)
-import Control.Applicative ((<|>))
+import Control.Applicative ((<|>),(<$>))
 import Control.Monad (join)
 
 -- $Usage
@@ -67,7 +67,6 @@ type StateFull = FocusTracking Full
 
 -- | A pattern synonym for the primary use case of the @FocusTracking@
 --   transformer; using @Full@.
-pattern StateFull :: StateFull a
 pattern StateFull = FocusTracking Nothing Full
 
 instance LayoutClass l Window => LayoutClass (FocusTracking l) Window where
diff --git a/XMonad/Util/Stack.hs b/XMonad/Util/Stack.hs
index b774bc17..953de723 100644
--- a/XMonad/Util/Stack.hs
+++ b/XMonad/Util/Stack.hs
@@ -80,7 +80,7 @@ module XMonad.Util.Stack ( -- * Usage
                          ) where
 
 import qualified XMonad.StackSet as W
-import Control.Applicative ((<|>))
+import Control.Applicative ((<|>),(<$>),(<$))
 import Control.Monad (guard,liftM)
 import Data.List (sortBy)