diff --git a/haddock.cabal b/haddock.cabal
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -1,5 +1,5 @@
 name:                 haddock
-version:              2.11.0
+version:              2.11.1
 synopsis:             A documentation-generation tool for Haskell libraries
 description:          Haddock is a documentation-generation tool for Haskell
                       libraries
@@ -106,7 +106,7 @@
   hs-source-dirs:       src
   default-extensions:   CPP, DeriveDataTypeable,
                         ScopedTypeVariables, MagicHash
-  ghc-options:          -funbox-strict-fields -O2 -Wall -fwarn-tabs
+  ghc-options:          -funbox-strict-fields -Wall -fwarn-tabs
 
   other-modules:
     Haddock.Interface
@@ -167,7 +167,7 @@
   hs-source-dirs:       src
   default-extensions:   CPP, DeriveDataTypeable,
                         ScopedTypeVariables, MagicHash
-  ghc-options:          -funbox-strict-fields -O2 -Wall -fwarn-tabs
+  ghc-options:          -funbox-strict-fields -Wall -fwarn-tabs
 
   exposed-modules:
     Documentation.Haddock
diff --git a/src/Documentation/Haddock.hs b/src/Documentation/Haddock.hs
--- a/src/Documentation/Haddock.hs
+++ b/src/Documentation/Haddock.hs
@@ -20,6 +20,10 @@
   processModules,
 
   -- * Export items & declarations
+  DocMap,
+  ArgMap,
+  AliasMap,
+  Documentation(..),
   ExportItem(..),
   DocForDecl,
   FnArgsDoc,