diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -9,20 +9,12 @@
 import System.Exit
 import System.IO (hFlush, stdout)
 
-#if defined(MIN_VERSION_Cabal) && MIN_VERSION_Cabal(2,4,0)
-#define NORMALISE_ARGS (\_ _ -> id)
-#else
-#define NORMALISE_ARGS
-#endif
-
 main :: IO ()
 main = defaultMainWithHooks hk
  where
  hk = simpleUserHooks { buildHook = \pd lbi uh bf -> do
-                                        let ccProg = Program "gcc" undefined undefined undefined NORMALISE_ARGS
-                                            hcProg = Program "ghc" undefined undefined undefined NORMALISE_ARGS
-                                            mConf  = lookupProgram ccProg (withPrograms lbi)
-                                            hcConf = lookupProgram hcProg (withPrograms lbi)
+                                        let mConf  = lookupProgram gccProgram (withPrograms lbi)
+                                            hcConf = lookupProgram ghcProgram (withPrograms lbi)
                                             err = error "Could not determine C compiler"
                                             _cc  = locationPath . programLocation  . maybe err id $ mConf
                                             hc  = locationPath . programLocation  . maybe err id $ hcConf
diff --git a/cipher-aes128.cabal b/cipher-aes128.cabal
--- a/cipher-aes128.cabal
+++ b/cipher-aes128.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                cipher-aes128
-version:             0.7.0.4
+version:             0.7.0.5
 synopsis:            AES and common modes using AES-NI when available.
 description:         Cipher-aes128 is an implementation of AES and common modes of operation.  It borrows Hanquez's C AES code (see 'cipher-aes') but
                      is unique due to including compile-time detection of
@@ -35,7 +35,7 @@
     default: False
 
 custom-setup
-  setup-depends: base >= 4.2 && <5, Cabal >= 1.10 && <2.5, process >=1.0
+  setup-depends: base >= 4.2 && <5, Cabal >= 1.10 && < 3.1, process >=1.0
 
 library
   default-language:    Haskell2010
@@ -67,6 +67,7 @@
   type:         exitcode-stdio-1.0
   hs-source-dirs:       . Benchmark
   main-is:              bench.hs
+  other-modules: Crypto.Cipher.AES128, Crypto.Cipher.AES128.Internal
   build-depends:        base < 5, criterion, crypto-api, entropy, bytestring, tagged, cereal
   ghc-options:          -O2
   include-dirs:        cbits