diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -2,25 +2,27 @@
 Copyright © 2011–2012 Wolfgang Jeltsch
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted
-provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-    • Redistributions of source code must retain the above copyright notice, this list of conditions
-      and the following disclaimer.
+    • Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
 
-    • Redistributions in binary form must reproduce the above copyright notice, this list of
-      conditions and the following disclaimer in the documentation and/or other materials provided
-      with the distribution.
+    • Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
 
-    • Neither the name of the copyright holders nor the names of the contributors may be used to
-      endorse or promote products derived from this software without specific prior written
-      permission.
+    • Neither the name of the copyright holders nor the names of the
+      contributors may be used to endorse or promote products derived from this
+      software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/Data/TypeFun.hs b/src/Data/TypeFun.hs
--- a/src/Data/TypeFun.hs
+++ b/src/Data/TypeFun.hs
@@ -18,7 +18,7 @@
 
 ) where
 
-    import Data.Kind as Kind
+    import "kinds" Data.Kind as Kind
 
     {-NOTE:
         At the value level, type-level function representations contain other /representations/ but
diff --git a/type-functions.cabal b/type-functions.cabal
--- a/type-functions.cabal
+++ b/type-functions.cabal
@@ -1,6 +1,6 @@
 Name:          type-functions
-Version:       0.2.0.3
-Cabal-Version: >= 1.6
+Version:       0.2.0.4
+Cabal-Version: >= 1.8
 Build-Type:    Simple
 License:       BSD3
 License-File:  LICENSE
@@ -10,31 +10,34 @@
 Maintainer:    wolfgang@cs.ioc.ee
 Stability:     provisional
 Homepage:      http://darcs.wolfgang.jeltsch.info/haskell/type-functions
-Package-URL:   http://hackage.haskell.org/packages/archive/type-functions/0.2.0.3/type-functions-0.2.0.3.tar.gz
+Package-URL:   http://hackage.haskell.org/packages/archive/type-functions/0.2.0.4/type-functions-0.2.0.4.tar.gz
 Synopsis:      Emulation of type-level functions
-Description:   This package supports emulation of type-level functions using defunctionalization.
-               All functions whose domain is a subkind of @*@ and whose codomain is @*@
-               itself can be represented.
+Description:   This package supports emulation of type-level functions using
+               defunctionalization. All functions whose domain is a subkind
+               of @*@ and whose codomain is @*@ itself can be
+               represented.
                .
-               For detailed information, please refer to Subsection 3.2 of the paper
+               For detailed information, please refer to Subsection 3.2 of
+               the paper
                /Generic Record Combinators with Static Type Checking/.
 Category:      Type System
-Tested-With:   GHC == 7.0.4
+Tested-With:   GHC == 8.0.1
 
 Source-Repository head
-    type:     darcs
-    location: http://darcs.wolfgang.jeltsch.info/haskell/type-functions/main
+    Type:     darcs
+    Location: http://darcs.wolfgang.jeltsch.info/haskell/type-functions/main
 
 Source-Repository this
-    type:     darcs
-    location: http://darcs.wolfgang.jeltsch.info/haskell/type-functions/main
-    tag:      type-functions-0.2.0.3
+    Type:     darcs
+    Location: http://darcs.wolfgang.jeltsch.info/haskell/type-functions/main
+    Tag:      type-functions-0.2.0.4
 
 Library
     Build-Depends:   base  >= 3.0   && < 5,
                      kinds >= 0.0.1 && < 0.1
     Extensions:      EmptyDataDecls
                      FlexibleContexts
+                     PackageImports
                      Rank2Types
                      TypeFamilies
                      TypeOperators