10 files changed, 5 insertions, 18 deletions
diff --git a/pandoc.hs b/pandoc.hs
index 44a483c64..3139f0f5d 100644
--- a/pandoc.hs
+++ b/pandoc.hs
@@ -73,7 +73,6 @@ import Control.Applicative ((<|>))
 import Text.Pandoc.Readers.Txt2Tags (getT2TMeta)
 import Paths_pandoc (getDataDir)
 import Text.Printf (printf)
-import Text.Pandoc.Error
 #ifndef _WINDOWS
 import System.Posix.Terminal (queryTerminal)
 import System.Posix.IO (stdOutput)
diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs
index 826862dee..4731fdb85 100644
--- a/src/Text/Pandoc.hs
+++ b/src/Text/Pandoc.hs
@@ -37,7 +37,6 @@ inline links:
 
 > module Main where
 > import Text.Pandoc
-> import Text.Pandoc.Error (handleError)
 >
 > markdownToRST :: String -> String
 > markdownToRST =
@@ -60,6 +59,8 @@ module Text.Pandoc
                , module Text.Pandoc.Generic
                -- * Options
                , module Text.Pandoc.Options
+               -- * Error handling
+               , module Text.Pandoc.Error
                -- * Lists of readers and writers
                , readers
                , writers
diff --git a/src/Text/Pandoc/Readers/EPUB.hs b/src/Text/Pandoc/Readers/EPUB.hs
index 7b1546939..4c31bf1ae 100644
--- a/src/Text/Pandoc/Readers/EPUB.hs
+++ b/src/Text/Pandoc/Readers/EPUB.hs
@@ -10,8 +10,9 @@ module Text.Pandoc.Readers.EPUB
 
 import Text.XML.Light
 import Text.Pandoc.Definition hiding (Attr)
-import Text.Pandoc.Walk (walk, query)
 import Text.Pandoc.Readers.HTML (readHtml)
+import Text.Pandoc.Error
+import Text.Pandoc.Walk (walk, query)
 import Text.Pandoc.Options ( ReaderOptions(..), readerTrace)
 import Text.Pandoc.Shared (escapeURI, collapseFilePath, addMetaField)
 import Network.URI (unEscapeString)
@@ -35,8 +36,6 @@ import Control.DeepSeq (deepseq, NFData)
 
 import Debug.Trace (trace)
 
-import Text.Pandoc.Error
-
 type Items = M.Map String (FilePath, MimeType)
 
 readEPUB :: ReaderOptions -> BL.ByteString -> Either PandocError (Pandoc, MediaBag)
diff --git a/tests/Tests/Readers/HTML.hs b/tests/Tests/Readers/HTML.hs
index 1a6983b2b..09041bfd1 100644
--- a/tests/Tests/Readers/HTML.hs
+++ b/tests/Tests/Readers/HTML.hs
@@ -7,7 +7,6 @@ import Tests.Helpers
 import Text.Pandoc.Arbitrary()
 import Text.Pandoc.Builder
 import Text.Pandoc
-import Text.Pandoc.Error
 
 html :: String -> Pandoc
 html = handleError . readHtml def
diff --git a/tests/Tests/Readers/LaTeX.hs b/tests/Tests/Readers/LaTeX.hs
index c70ce8052..27e775724 100644
--- a/tests/Tests/Readers/LaTeX.hs
+++ b/tests/Tests/Readers/LaTeX.hs
@@ -7,7 +7,6 @@ import Tests.Helpers
 import Text.Pandoc.Arbitrary()
 import Text.Pandoc.Builder
 import Text.Pandoc
-import Text.Pandoc.Error
 
 latex :: String -> Pandoc
 latex = handleError . readLaTeX def
diff --git a/tests/Tests/Readers/Markdown.hs b/tests/Tests/Readers/Markdown.hs
index e877b81ca..9219b6930 100644
--- a/tests/Tests/Readers/Markdown.hs
+++ b/tests/Tests/Readers/Markdown.hs
@@ -7,9 +7,7 @@ import Tests.Helpers
 import Text.Pandoc.Arbitrary()
 import Text.Pandoc.Builder
 import qualified Data.Set as Set
--- import Text.Pandoc.Shared ( normalize )
 import Text.Pandoc
-import Text.Pandoc.Error
 
 markdown :: String -> Pandoc
 markdown = handleError . readMarkdown def
diff --git a/tests/Tests/Readers/Odt.hs b/tests/Tests/Readers/Odt.hs
index 74796d899..b0c5aefb1 100644
--- a/tests/Tests/Readers/Odt.hs
+++ b/tests/Tests/Readers/Odt.hs
@@ -5,18 +5,13 @@ import Text.Pandoc.Options
 import Text.Pandoc.Readers.Native
 import Text.Pandoc.Readers.Markdown
 import Text.Pandoc.Definition
-import Text.Pandoc.Error
 import Tests.Helpers
 import Test.Framework
---import Test.HUnit (assertBool)
---import Test.Framework.Providers.HUnit
 import qualified Data.ByteString.Lazy as B
 import Text.Pandoc.Readers.Odt
 import Text.Pandoc.Writers.Native (writeNative)
 import qualified Data.Map as M
---import Text.Pandoc.MediaBag (MediaBag, lookupMedia, mediaDirectory)
---import Codec.Archive.Zip
-
+import Text.Pandoc.Error
 
 tests :: [Test]
 tests = testsComparingToMarkdown ++ testsComparingToNative
diff --git a/tests/Tests/Readers/Org.hs b/tests/Tests/Readers/Org.hs
index 3eab710dc..48d0da51c 100644
--- a/tests/Tests/Readers/Org.hs
+++ b/tests/Tests/Readers/Org.hs
@@ -7,7 +7,6 @@ import Tests.Helpers
 import Text.Pandoc.Builder
 import Text.Pandoc
 import Data.List (intersperse)
-import Text.Pandoc.Error
 
 org :: String -> Pandoc
 org = handleError . readOrg def
diff --git a/tests/Tests/Readers/RST.hs b/tests/Tests/Readers/RST.hs
index 06a15ad98..9ecbb7af7 100644
--- a/tests/Tests/Readers/RST.hs
+++ b/tests/Tests/Readers/RST.hs
@@ -7,7 +7,6 @@ import Tests.Helpers
 import Text.Pandoc.Arbitrary()
 import Text.Pandoc.Builder
 import Text.Pandoc
-import Text.Pandoc.Error
 
 rst :: String -> Pandoc
 rst = handleError . readRST def{ readerStandalone = True }
diff --git a/tests/Tests/Readers/Txt2Tags.hs b/tests/Tests/Readers/Txt2Tags.hs
index e291c3ffe..1bda32a49 100644
--- a/tests/Tests/Readers/Txt2Tags.hs
+++ b/tests/Tests/Readers/Txt2Tags.hs
@@ -7,7 +7,6 @@ import Tests.Helpers
 import Text.Pandoc.Arbitrary()
 import Text.Pandoc.Builder
 import Text.Pandoc
-import Text.Pandoc.Error
 import Data.List (intersperse)
 import Text.Pandoc.Readers.Txt2Tags