diff --git a/src/Foreign/Storable/Tuple.hs b/src/Foreign/Storable/Tuple.hs
--- a/src/Foreign/Storable/Tuple.hs
+++ b/src/Foreign/Storable/Tuple.hs
@@ -3,7 +3,7 @@
 -}
 module Foreign.Storable.Tuple where
 
-import Foreign.Storable.Unit ()
+import Data.Orphans ()
 import Foreign.Storable (Storable (..), )
 import qualified Foreign.Storable.Record as Store
 import Control.Applicative (liftA2, liftA3, pure, (<*>), )
diff --git a/storable-tuple.cabal b/storable-tuple.cabal
--- a/storable-tuple.cabal
+++ b/storable-tuple.cabal
@@ -1,5 +1,5 @@
 Name:         storable-tuple
-Version:      0.0.3.1
+Version:      0.0.3.2
 Category:     Data, Foreign
 Synopsis:     Storable instance for pairs and triples
 Description:
@@ -8,7 +8,7 @@
 
   The only purpose of this package is to provide a standard location
   for this instance so that other packages needing this instance
-  can play nicely together. 
+  can play nicely together.
 License:             BSD3
 License-file:        LICENSE
 Author:              Henning Thielemann <storable@henning-thielemann.de>
@@ -18,9 +18,6 @@
 Build-Type:          Simple
 Tested-With:         GHC==6.8.2, GHC==8.0.1
 Cabal-Version:       >=1.6
-Extra-Source-Files:
-  unit/instance/Foreign/Storable/Unit.hs
-  unit/no-instance/Foreign/Storable/Unit.hs
 
 Source-Repository head
   Type:     darcs
@@ -29,7 +26,7 @@
 Source-Repository this
   Type:     darcs
   Location: http://code.haskell.org/~thielema/storable-tuple/
-  Tag:      0.0.3.1
+  Tag:      0.0.3.2
 
 Flag splitBase
   Description: Choose the new smaller, split-up base package.
@@ -37,14 +34,10 @@
 Library
   Build-Depends:
     storable-record >=0.0.1 && <0.1,
-    utility-ht >=0.0.1 && <0.1
+    utility-ht >=0.0.1 && <0.1,
+    base-orphans >= 0.5 && <1
   If flag(splitBase)
-    If impl(ghc<8)
-      Build-Depends: base >=3 && <4.9
-      Hs-Source-Dirs: unit/instance
-    Else
-      Build-Depends: base >=4.9 && <5
-      Hs-Source-Dirs: unit/no-instance
+    Build-Depends: base >=3 && <5
   Else
     Build-Depends:
       special-functors >= 1.0 && <1.1,
@@ -55,5 +48,3 @@
 
   Exposed-Modules:
     Foreign.Storable.Tuple
-  Other-Modules:
-    Foreign.Storable.Unit
diff --git a/unit/instance/Foreign/Storable/Unit.hs b/unit/instance/Foreign/Storable/Unit.hs
deleted file mode 100644
--- a/unit/instance/Foreign/Storable/Unit.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-module Foreign.Storable.Unit where
-
-import Foreign.Storable (Storable (..), )
-
-
-instance Storable () where
-   sizeOf    _ = 0
-   alignment _ = 1
-   peek      _ = return ()
-   poke    _ _ = return ()
diff --git a/unit/no-instance/Foreign/Storable/Unit.hs b/unit/no-instance/Foreign/Storable/Unit.hs
deleted file mode 100644
--- a/unit/no-instance/Foreign/Storable/Unit.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-module Foreign.Storable.Unit where
-
-import Foreign.Storable ()