diff --git a/src/Z80/Assembler.hs b/src/Z80/Assembler.hs
index 8d2e2e9..6f9b350 100644
--- a/src/Z80/Assembler.hs
+++ b/src/Z80/Assembler.hs
@@ -1,5 +1,8 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE CPP #-}
+
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 
 module Z80.Assembler
@@ -22,11 +25,14 @@ import Data.Word
 import qualified Data.ByteString as BS
 import Data.ByteString (ByteString)
 
+import Control.Monad.Fix (MonadFix(..))
 import Control.Monad.RWS
 import Data.Maybe
 
+#if !MIN_VERSION_base(4,8,0)
 import Control.Applicative
 import Data.Traversable (traverse)
+#endif
 import Prelude
 
 import Z80.Operands
diff --git a/src/Z80/Operations.hs b/src/Z80/Operations.hs
index 01542a9..4d6af08 100644
--- a/src/Z80/Operations.hs
+++ b/src/Z80/Operations.hs
@@ -1,8 +1,10 @@
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE IncoherentInstances #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 
 module Z80.Operations
@@ -107,7 +109,9 @@ import Data.Word
 import Z80.Assembler
 import Z80.Operands
 
+#if !MIN_VERSION_base(4,8,0)
 import Control.Applicative ((<$>))
+#endif
 import Control.Monad       ((>=>))
 import Prelude hiding      (and, or)
 
diff --git a/z80.cabal b/z80.cabal
index 7a2b064..d41f117 100644
--- a/z80.cabal
+++ b/z80.cabal
@@ -19,7 +19,7 @@ library
                        Z80.Operands,
                        Z80.Operands.LowerCase,
                        Z80.Macros
-  build-depends:       base >=4.7 && <4.9,
+  build-depends:       base >=4.7,
                        bytestring,
                        mtl
   hs-source-dirs:      src
@@ -29,7 +29,7 @@ library
 test-suite tests
   type:                exitcode-stdio-1.0
   main-is:             tests.hs
-  build-depends:       base >=4.7 && <4.9,
+  build-depends:       base >=4.7,
                        bytestring,
                        mtl,
                        HUnit,
@@ -37,4 +37,4 @@ test-suite tests
                        tasty-hunit
   hs-source-dirs:      tests, src
   ghc-options:         -Wall
-  default-language:    Haskell2010
\ No newline at end of file
+  default-language:    Haskell2010