diff --git a/OpenAL.cabal b/OpenAL.cabal
--- a/OpenAL.cabal
+++ b/OpenAL.cabal
@@ -1,5 +1,5 @@
 name: OpenAL
-version: 1.5.0.0
+version: 1.6.0.0
 license: BSD3
 license-file: LICENSE
 maintainer: Sven Panne <svenpanne@gmail.com>, Stephen Blackheath <haskell.openal.stephen@blacksapphire.com>
@@ -35,15 +35,12 @@
     exposed-modules:
             Sound.OpenAL,
             Sound.OpenAL.AL,
-            Sound.OpenAL.AL.ALboolean,
             Sound.OpenAL.AL.Attenuation,
             Sound.OpenAL.AL.BasicTypes,
             Sound.OpenAL.AL.Buffer,
-            Sound.OpenAL.AL.BufferInternal,
             Sound.OpenAL.AL.Doppler,
             Sound.OpenAL.AL.Errors,
             Sound.OpenAL.AL.Extensions,
-            Sound.OpenAL.AL.Format,
             Sound.OpenAL.AL.Listener,
             Sound.OpenAL.AL.Source,
             Sound.OpenAL.AL.StringQueries,
@@ -55,6 +52,9 @@
             Sound.OpenAL.ALC.Errors,
             Sound.OpenAL.ALC.Extensions
     other-modules:
+            Sound.OpenAL.AL.ALboolean,
+            Sound.OpenAL.AL.BufferInternal,
+            Sound.OpenAL.AL.Format,
             Sound.OpenAL.AL.PeekPoke,
             Sound.OpenAL.AL.QueryUtils,
             Sound.OpenAL.AL.SourceState,
diff --git a/Sound/OpenAL/AL/Extensions.hs b/Sound/OpenAL/AL/Extensions.hs
--- a/Sound/OpenAL/AL/Extensions.hs
+++ b/Sound/OpenAL/AL/Extensions.hs
@@ -16,7 +16,11 @@
 --------------------------------------------------------------------------------
 
 module Sound.OpenAL.AL.Extensions (
-   alExtensions, alIsExtensionPresent, alProcAddress, alEnumValue, alVersion
+   -- * General AL extension support
+   alExtensions, alIsExtensionPresent, alProcAddress, alEnumValue, alVersion,
+
+   -- * Internal re-exports, use at your own risk
+   unmarshalALboolean, unmarshalFormat, unmarshalBuffer
 ) where
 
 import Foreign.C.Types
@@ -24,6 +28,8 @@
 import Graphics.Rendering.OpenGL.GL.StateVar
 import Sound.OpenAL.AL.ALboolean
 import Sound.OpenAL.AL.BasicTypes
+import Sound.OpenAL.AL.BufferInternal
+import Sound.OpenAL.AL.Format
 import Sound.OpenAL.AL.QueryUtils
 import Sound.OpenAL.AL.String