diff --git a/OpenGLRaw.cabal b/OpenGLRaw.cabal
--- a/OpenGLRaw.cabal
+++ b/OpenGLRaw.cabal
@@ -1,5 +1,5 @@
 name: OpenGLRaw
-version: 2.2.0.0
+version: 2.3.0.0
 synopsis: A raw binding for the OpenGL graphics system
 description:
   OpenGLRaw is a raw Haskell binding for the OpenGL 4.5 graphics system and
diff --git a/RegistryProcessor/src/Main.hs b/RegistryProcessor/src/Main.hs
--- a/RegistryProcessor/src/Main.hs
+++ b/RegistryProcessor/src/Main.hs
@@ -62,6 +62,11 @@
     SI.hPutStrLn h . separate unCommandName . M.keys . commands $registry
     SI.hPutStrLn h ") where"
     SI.hPutStrLn h ""
+    SI.hPutStrLn h "-- Make the foreign imports happy."
+    SI.hPutStrLn h "import Data.Int"
+    SI.hPutStrLn h "import Data.Word"
+    SI.hPutStrLn h "import Foreign.C.Types"
+    SI.hPutStrLn h ""
     SI.hPutStrLn h "import Foreign.Marshal.Error ( throwIf )"
     SI.hPutStrLn h "import Foreign.Ptr ( Ptr, FunPtr, nullFunPtr )"
     SI.hPutStrLn h "import System.IO.Unsafe ( unsafePerformIO )"
diff --git a/src/Graphics/Rendering/OpenGL/Raw/Functions.hs b/src/Graphics/Rendering/OpenGL/Raw/Functions.hs
# file too large to diff: src/Graphics/Rendering/OpenGL/Raw/Functions.hs
diff --git a/src/Graphics/Rendering/OpenGL/Raw/Types.hs b/src/Graphics/Rendering/OpenGL/Raw/Types.hs
--- a/src/Graphics/Rendering/OpenGL/Raw/Types.hs
+++ b/src/Graphics/Rendering/OpenGL/Raw/Types.hs
@@ -56,25 +56,7 @@
   GLclampx,
   GLhandleARB,
   GLvdpauSurfaceNV,
-  GLeglImageOES,
-
-  -- * Re-exports
-  CChar(..),
-  CDouble(..),
-  CFloat(..),
-  CInt(..),
-  CPtrdiff(..),
-  CSChar(..),
-  CShort(..),
-  CUChar(..),
-  CUInt(..),
-  CUShort(..),
-
-  Int64(..),
-  Word64(..),
-
-  FunPtr(..),
-  Ptr(..)
+  GLeglImageOES
 ) where
 
 import Data.Int