diff --git a/Database/Enumerator.hs b/Database/Enumerator.hs
--- a/Database/Enumerator.hs
+++ b/Database/Enumerator.hs
@@ -119,6 +119,7 @@
 import Data.Maybe (fromMaybe, isNothing)
 -- import Control.Monad (liftM)
 -- import Control.Monad.Trans (liftIO)
+import Control.Applicative (Applicative)
 import Control.Exception
 import Control.Monad.Fix
 import Control.Monad.Reader
@@ -209,10 +210,10 @@
 
 newtype IE.ISession sess => DBM mark sess a = DBM (ReaderT sess IO a)
 #ifndef __HADDOCK__
-  deriving (Functor, Monad, MonadIO, MonadFix, MonadReader sess)
+  deriving (Functor, Monad, Applicative, MonadIO, MonadFix, MonadReader sess)
 #else
   -- Haddock can't cope with the "MonadReader sess" instance
-  deriving (Functor, Monad, MonadIO, MonadFix)
+  deriving (Functor, Monad, Applicative, MonadIO, MonadFix)
 #endif
 unDBM (DBM x) = x
 
diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -18,9 +18,9 @@
 import Distribution.Verbosity (Verbosity)
 
 import qualified System.Info (os)
-import System.Directory (canonicalizePath, removeFile)
+import System.Directory (canonicalizePath, removeFile, doesDirectoryExist)
 import System.Environment (getEnv)
-import System.FilePath (combine, dropFileName, FilePath, pathSeparators)
+import System.FilePath (combine, dropFileName, FilePath, pathSeparators, (</>))
 import Control.Monad(liftM)
 import Control.Exception (SomeException, try, catch)
 import Data.List (isInfixOf)
@@ -123,15 +123,26 @@
 -- Header files are in: ORACLE_BASE\ORACLE_HOME\oci\include
 -- DLLs are in: ORACLE_BASE\ORACLE_HOME\bin
 --
--- For Unix:
+-- For Unix full install:
 -- Appendix B - OCI Demonstration Programs:
 -- http://download.oracle.com/docs/cd/B19306_01/appdev.102/b14250/ociabdem.htm#i459676
 -- Header files are in: $ORACLE_HOME/rdbms/public
--- Header files are in: $ORACLE_HOME/lib
+-- Object files are in: $ORACLE_HOME/lib
+--
+-- For Unix client only install:
+-- Header files are in: $ORACLE_HOME/oci/include
+-- Object files are in: $ORACLE_HOME
 
 configOracle verbose buildtools =
   guardProg sqlplusProgram buildtools $
   guardPath (maybeGetEnv "ORACLE_HOME") "Oracle" verbose $ \path -> do
+  let fullInstallDirs = ("lib", "rdbms/public")
+  isFullInstall <- doesDirectoryExist (path </> snd fullInstallDirs)
   let (libDir, incDir) =
-          if isWindows then ("bin", "oci/include") else ("", "sdk/include") -- ("lib", "rdbms/public")
+        if isWindows
+        then ("bin", "oci/include")
+        else if isFullInstall
+        then fullInstallDirs
+        else ("", "sdk/include")
   makeConfig path libDir incDir
+
diff --git a/takusen-oracle.cabal b/takusen-oracle.cabal
--- a/takusen-oracle.cabal
+++ b/takusen-oracle.cabal
@@ -1,5 +1,5 @@
 Name:           takusen-oracle
-Version:        0.9.0
+Version:        0.9.1
 License:        BSD3
 License-file:   LICENSE
 Author:         Alistair Bayley, Oleg Kiselyov, Pavel Ryzhov
