diff --git a/CPython/Protocols/Mapping.chs b/CPython/Protocols/Mapping.chs
--- a/CPython/Protocols/Mapping.chs
+++ b/CPython/Protocols/Mapping.chs
@@ -28,7 +28,6 @@
 	, items
 	) where
 import CPython.Internal
-import CPython.Types.Dictionary (Dictionary)
 
 #include <hscpython-shim.h>
 
diff --git a/CPython/Types.hs b/CPython/Types.hs
--- a/CPython/Types.hs
+++ b/CPython/Types.hs
@@ -24,10 +24,10 @@
 	, Complex
 	, Dictionary
 	, Exception
-	, Float
+	, CPython.Types.Float.Float
 	, Function
 	, InstanceMethod
-	, Integer
+	, CPython.Types.Integer.Integer
 	, SequenceIterator
 	, CallableIterator
 	, Iterator
@@ -77,8 +77,8 @@
 	, fromComplex
 	, toFloat
 	, fromFloat
-	, toInteger
-	, fromInteger
+	, CPython.Types.Integer.toInteger
+	, CPython.Types.Integer.fromInteger
 	, toList
 	, iterableToList
 	, fromList
@@ -93,7 +93,6 @@
 	, toUnicode
 	, fromUnicode
 	) where
-import qualified Prelude as Prelude
 import CPython.Types.ByteArray
 import CPython.Types.Bytes
 import CPython.Types.Capsule
diff --git a/CPython/Types/Iterator.chs b/CPython/Types/Iterator.chs
--- a/CPython/Types/Iterator.chs
+++ b/CPython/Types/Iterator.chs
@@ -27,7 +27,6 @@
 	, next
 	) where
 import CPython.Internal
-import CPython.Protocols.Sequence (Sequence)
 
 #include <hscpython-shim.h>
 
diff --git a/CPython/Types/List.chs b/CPython/Types/List.chs
--- a/CPython/Types/List.chs
+++ b/CPython/Types/List.chs
@@ -32,7 +32,6 @@
 	, toTuple
 	) where
 import Prelude hiding (reverse, length)
-import qualified Prelude as Prelude
 import CPython.Internal hiding (new)
 import qualified CPython.Types.Tuple as T
 
diff --git a/CPython/Types/Tuple.chs b/CPython/Types/Tuple.chs
--- a/CPython/Types/Tuple.chs
+++ b/CPython/Types/Tuple.chs
@@ -26,7 +26,6 @@
 	, setItem
 	) where
 import Prelude hiding (length)
-import qualified Prelude as Prelude
 import CPython.Internal hiding (new)
 
 #include <hscpython-shim.h>
diff --git a/cpython.cabal b/cpython.cabal
--- a/cpython.cabal
+++ b/cpython.cabal
@@ -1,25 +1,40 @@
 name: cpython
-version: 3.1.0
+version: 3.1.1.0
 synopsis: Bindings for libpython
 license: GPL-3
 license-file: license.txt
 author: John Millikin
 maintainer: jmillikin@gmail.com
-copyright: Copyright (c) John Millikin 2009,
+copyright: Copyright (c) John Millikin 2009-2010,
                      (c) Python Software Foundation 2001-2009.
 build-type: Simple
-cabal-version: >=1.4
+cabal-version: >=1.6
 category: Foreign
-homepage: http://ianen.org/haskell/bindings/cpython/
-tested-with: GHC==6.10.1, GHC==6.10.4
+homepage: http://john-millikin.com/software/bindings/cpython/
+tested-with: GHC==6.12.1
 extra-source-files: hscpython-shim.h
 
+description:
+  These bindings allow Haskell code to call CPython code. It is not
+  currently possible to call Haskell code from CPython, but this feature
+  is planned.
+  .
+  Please note that this library uses a somewhat abnormal versioning scheme;
+  the first two version numbers are the CPython version, the third is the
+  package's major version, and the fourth is the package's minor version.
+  For example, the package version 3.1.1.0 binds to CPython 3.1, and has
+  a package version of (1, 0).
+
+source-repository head
+  type: bazaar
+  location: http://john-millikin.com/software/bindings/cpython/
+
 library
   ghc-options: -Wall -fno-warn-orphans
   build-depends:
       base >=4 && < 5
-    , bytestring
-    , text
+    , bytestring >= 0.9 && < 0.10
+    , text >= 0.1 && < 0.11
 
   build-tools:
     c2hs >= 0.15
diff --git a/hscpython-shim.h b/hscpython-shim.h
--- a/hscpython-shim.h
+++ b/hscpython-shim.h
@@ -1,3 +1,6 @@
+#ifndef HSCPYTHON_SHIM_H
+#define HSCPYTHON_SHIM_H
+
 #include <Python.h>
 
 /* Initialization helpers */
@@ -75,3 +78,5 @@
 /* Tuples */
 void hscpython_peek_tuple (PyObject *, Py_ssize_t, PyObject **);
 PyObject *hscpython_poke_tuple (size_t, PyObject **);
+
+#endif