5 files changed, 8 insertions, 7 deletions
diff --git a/src/Haddock/Html.hs b/src/Haddock/Html.hs
index c6b4edf0..c89485bc 100644
--- a/src/Haddock/Html.hs
+++ b/src/Haddock/Html.hs
@@ -33,7 +33,7 @@ import Debug.Trace           ( trace )
 import Data.Map              ( Map )
 import qualified Data.Map as Map hiding ( Map )
 
-import GHC hiding ( NoLink )
+import GHC 
 import Name
 import Module
 import PackageConfig         ( stringToPackageId )
diff --git a/src/Haddock/InterfaceFile.hs b/src/Haddock/InterfaceFile.hs
index 5e8a9424..54dc3618 100644
--- a/src/Haddock/InterfaceFile.hs
+++ b/src/Haddock/InterfaceFile.hs
@@ -16,6 +16,8 @@ import qualified Data.Map as Map
 import System.IO
 import Control.Monad
 
+import GHC
+import SrcLoc   ( noSrcSpan ) -- tmp, GHC now exports this
 import Binary
 import Name
 import UniqSupply
@@ -23,7 +25,6 @@ import UniqFM
 import IfaceEnv
 import Module
 import Packages
-import SrcLoc
 import HscTypes
 import FastMutInt
 import InstEnv
@@ -182,7 +183,7 @@ fromOnDiskName arr nc (pid, mod_name, occ) =
         let 
                 us        = nsUniqs nc
                 uniq      = uniqFromSupply us
-                name      = mkExternalName uniq mod occ noSrcSpan
+                name      = mkExternalName uniq mod occ noSrcLoc
                 new_cache = extendNameCache cache mod occ name
         in        
         case splitUniqSupply us of { (us',_) -> 
diff --git a/src/Haddock/Rename.hs b/src/Haddock/Rename.hs
index 6ba07215..c8e5cc8e 100644
--- a/src/Haddock/Rename.hs
+++ b/src/Haddock/Rename.hs
@@ -11,7 +11,7 @@ module Haddock.Rename (
 
 import Haddock.Types
 
-import GHC hiding ( NoLink )
+import GHC
 import BasicTypes
 import SrcLoc 
 import Bag ( emptyBag )
diff --git a/src/Haddock/Types.hs b/src/Haddock/Types.hs
index 6ae2309e..4c4587ac 100644
--- a/src/Haddock/Types.hs
+++ b/src/Haddock/Types.hs
@@ -8,7 +8,7 @@
 
 module Haddock.Types where
 
-import GHC hiding (NoLink)
+import GHC
 import Outputable
 
 import Data.Map
diff --git a/src/Haddock/Version.hs b/src/Haddock/Version.hs
index 3df24f1c..f4d02b7d 100644
--- a/src/Haddock/Version.hs
+++ b/src/Haddock/Version.hs
@@ -8,8 +8,8 @@ module Haddock.Version (
 	projectName, projectVersion, projectUrl
    ) where
 
-import Paths_haddock ( version )
-import Data.Version  ( showVersion )
+import Paths_haddock_ghc ( version )
+import Data.Version      ( showVersion )
 
 projectName, projectUrl :: String
 projectName = "Haddock-GHC"