6 files changed, 47 insertions, 12 deletions
diff --git a/src/Haddock/Backends/Xhtml/Decl.hs b/src/Haddock/Backends/Xhtml/Decl.hs
index a40605b4..6f66ece8 100644
--- a/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/src/Haddock/Backends/Xhtml/Decl.hs
@@ -10,8 +10,12 @@
 -- Stability   :  experimental
 -- Portability :  portable
 -----------------------------------------------------------------------------
-
-module Haddock.Backends.Xhtml.Decl where
+module Haddock.Backends.Xhtml.Decl (
+  ppDecl,
+  
+  ppTyName, ppTyFamHeader, ppTypeApp,
+  tyvarNames
+) where
 
 import Haddock.Backends.Xhtml.DocMarkup
 import Haddock.Backends.Xhtml.Layout
diff --git a/src/Haddock/Backends/Xhtml/DocMarkup.hs b/src/Haddock/Backends/Xhtml/DocMarkup.hs
index 3e925ce0..fda7c7d2 100644
--- a/src/Haddock/Backends/Xhtml/DocMarkup.hs
+++ b/src/Haddock/Backends/Xhtml/DocMarkup.hs
@@ -10,8 +10,11 @@
 -- Stability   :  experimental
 -- Portability :  portable
 -----------------------------------------------------------------------------
-
-module Haddock.Backends.Xhtml.DocMarkup where
+module Haddock.Backends.Xhtml.DocMarkup (
+  docToHtml, maybeDocToHtml,
+  rdrDocToHtml,
+  origDocToHtml
+) where
 
 import Haddock.Backends.Xhtml.Names
 import Haddock.Backends.Xhtml.Util
diff --git a/src/Haddock/Backends/Xhtml/Layout.hs b/src/Haddock/Backends/Xhtml/Layout.hs
index ce035c24..ac6f5021 100644
--- a/src/Haddock/Backends/Xhtml/Layout.hs
+++ b/src/Haddock/Backends/Xhtml/Layout.hs
@@ -10,8 +10,14 @@
 -- Stability   :  experimental
 -- Portability :  portable
 -----------------------------------------------------------------------------
-
-module Haddock.Backends.Xhtml.Layout where
+module Haddock.Backends.Xhtml.Layout (
+  topDeclElem, declElem,
+  
+  instHdr, atHdr, methHdr, constrHdr,
+  argBox, ndocBox, rdocBox, maybeRDocBox,
+  
+  vanillaTable, vanillaTable2, spacedTable1, spacedTable5  
+) where
 
 import Haddock.Backends.Xhtml.DocMarkup
 import Haddock.Backends.Xhtml.Types
diff --git a/src/Haddock/Backends/Xhtml/Names.hs b/src/Haddock/Backends/Xhtml/Names.hs
index cbf87c23..755b7a2d 100644
--- a/src/Haddock/Backends/Xhtml/Names.hs
+++ b/src/Haddock/Backends/Xhtml/Names.hs
@@ -10,8 +10,12 @@
 -- Stability   :  experimental
 -- Portability :  portable
 -----------------------------------------------------------------------------
-
-module Haddock.Backends.Xhtml.Names where
+module Haddock.Backends.Xhtml.Names (
+  ppName, ppDocName, ppLDocName, ppRdrName,
+  ppBinder, ppBinder',
+  ppModule,
+  linkId
+) where
 
 import Haddock.Backends.Xhtml.Util
 import Haddock.GhcUtils
diff --git a/src/Haddock/Backends/Xhtml/Types.hs b/src/Haddock/Backends/Xhtml/Types.hs
index e4d26fc9..aff47131 100644
--- a/src/Haddock/Backends/Xhtml/Types.hs
+++ b/src/Haddock/Backends/Xhtml/Types.hs
@@ -10,8 +10,10 @@
 -- Stability   :  experimental
 -- Portability :  portable
 -----------------------------------------------------------------------------
-
-module Haddock.Backends.Xhtml.Types where
+module Haddock.Backends.Xhtml.Types (
+  SourceURLs, WikiURLs,
+  LinksInfo
+) where
 
 
 -- the base, module and entity URLs for the source code and wiki links.
diff --git a/src/Haddock/Backends/Xhtml/Util.hs b/src/Haddock/Backends/Xhtml/Util.hs
index cbaf6766..8229e002 100644
--- a/src/Haddock/Backends/Xhtml/Util.hs
+++ b/src/Haddock/Backends/Xhtml/Util.hs
@@ -10,8 +10,24 @@
 -- Stability   :  experimental
 -- Portability :  portable
 -----------------------------------------------------------------------------
-
-module Haddock.Backends.Xhtml.Util where
+module Haddock.Backends.Xhtml.Util (
+  renderToString,
+  
+  namedAnchor, linkedAnchor,
+  spliceURL,
+  
+  (<+>), (<++>), char, empty,
+  keyword, punctuate,
+  
+  braces, brackets, pabrackets, parens, parenList, ubxParenList,
+  arrow, comma, dcolon, dot, darrow, equals, forallSymbol, quote,
+  
+  tda, emptyTable, s8,
+  abovesSep, hsep,
+  
+  collapsebutton, collapseId, collapsed,
+  documentCharacterEncoding, styleSheet
+) where
 
 import Haddock.GhcUtils
 import Haddock.Utils