diff --git a/Data/Stream/Infinite/Functional/Zipper.hs b/Data/Stream/Infinite/Functional/Zipper.hs
--- a/Data/Stream/Infinite/Functional/Zipper.hs
+++ b/Data/Stream/Infinite/Functional/Zipper.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE DeriveDataTypeable, PatternGuards, BangPatterns #-}
+{-# LANGUAGE CPP, PatternGuards, BangPatterns #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Zipper.Infinite.Functional.Zipper
@@ -52,7 +52,9 @@
 import Control.Applicative
 import Control.Comonad
 -- import Data.Char (isSpace)
+#ifdef LANGUAGE_DeriveDataTypeable
 import Data.Data
+#endif
 import Data.Functor.Apply
 -- import Data.Monoid
 import Data.Semigroup
@@ -63,7 +65,9 @@
 -- import Data.Zipper.NonEmpty (NonEmpty(..))
 
 data Zipper a = !Integer :~ !(Integer -> a)
+#ifdef LANGUAGE_DeriveDataTypeable
   deriving Typeable
+#endif
 
 toSequence :: (Integer -> a) -> Zipper a
 toSequence = (0 :~) 
diff --git a/Data/Stream/Supply.hs b/Data/Stream/Supply.hs
--- a/Data/Stream/Supply.hs
+++ b/Data/Stream/Supply.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP, FlexibleContexts, UndecidableInstances #-}
+{-# LANGUAGE CPP, FlexibleContexts #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Stream.Supply
diff --git a/streams.cabal b/streams.cabal
--- a/streams.cabal
+++ b/streams.cabal
@@ -1,6 +1,6 @@
 name:          streams
 category:      Control, Comonads
-version:       0.8.0.1
+version:       0.8.0.2
 license:       BSD3
 cabal-version: >= 1.6
 license-file:  LICENSE
@@ -75,6 +75,10 @@
   location: git://github.com/ekmett/streams.git
   
 library
+  other-extensions:
+    PatternGuards
+    BangPatterns
+
   build-depends:
     base >= 4 && < 5,
     comonad >= 1.1 && < 1.2,