6 files changed, 18 insertions, 18 deletions
diff --git a/src/Haddock/Html.hs b/src/Haddock/Html.hs
index 6bd80687..c6b4edf0 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 
+import GHC hiding ( NoLink )
 import Name
 import Module
 import PackageConfig         ( stringToPackageId )
@@ -1044,8 +1044,8 @@ ppSideBySideConstr (L _ con) = case con_res con of
     mbLDoc  = con_doc con
     mkFunTy a b = noLoc (HsFunTy a b)
 
-ppSideBySideField :: HsRecField DocName (LHsType DocName) -> HtmlTable
-ppSideBySideField (HsRecField lname ltype mbLDoc) =
+ppSideBySideField :: ConDeclField DocName -> HtmlTable
+ppSideBySideField (ConDeclField lname ltype mbLDoc) =
   argBox (ppBinder False (orig lname)
     <+> dcolon <+> ppLType ltype) <->
   maybeRDocBox mbLDoc
@@ -1077,8 +1077,8 @@ ppHsFullConstr (HsRecDecl _ nm tvs ctxt fields doc) =
 		)
 -}
 
-ppShortField :: Bool -> HsRecField DocName (LHsType DocName)-> HtmlTable
-ppShortField summary (HsRecField lname ltype mbLDoc) 
+ppShortField :: Bool -> ConDeclField DocName -> HtmlTable
+ppShortField summary (ConDeclField lname ltype _) 
   = tda [theclass "recfield"] << (
       ppBinder summary (orig lname)
       <+> dcolon <+> ppLType ltype
diff --git a/src/Haddock/InterfaceFile.hs b/src/Haddock/InterfaceFile.hs
index c4f24bef..5e8a9424 100644
--- a/src/Haddock/InterfaceFile.hs
+++ b/src/Haddock/InterfaceFile.hs
@@ -182,7 +182,7 @@ fromOnDiskName arr nc (pid, mod_name, occ) =
         let 
                 us        = nsUniqs nc
                 uniq      = uniqFromSupply us
-                name      = mkExternalName uniq mod occ noSrcLoc
+                name      = mkExternalName uniq mod occ noSrcSpan
                 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 7e12a412..6ba07215 100644
--- a/src/Haddock/Rename.hs
+++ b/src/Haddock/Rename.hs
@@ -11,7 +11,7 @@ module Haddock.Rename (
 
 import Haddock.Types
 
-import GHC
+import GHC hiding ( NoLink )
 import BasicTypes
 import SrcLoc 
 import Bag ( emptyBag )
@@ -186,7 +186,7 @@ renameType t = case t of
     return (HsDocTy t' doc')
 
   _ -> error "renameType"
- 
+
 renameLTyVarBndr (L loc tv) = do
   name' <- rename (hsTyVarName tv)
   return $ L loc (replaceTyVarName tv name')
@@ -261,11 +261,11 @@ renameTyClD d = case d of
       a' <- renameLType a
       b' <- renameLType b
       return (InfixCon a' b')
-  
-    renameField (HsRecField id arg doc) = do
-      arg' <- renameLType arg
-      doc' <- mapM renameLDoc doc 
-      return (HsRecField (keepL id) arg' doc')
+
+    renameField (ConDeclField name t doc) = do
+      t'   <- renameLType t
+      doc' <- mapM renameLDoc doc
+      return (ConDeclField (keepL name) t' doc')
 
     renameResType (ResTyH98) = return ResTyH98
     renameResType (ResTyGADT t) = return . ResTyGADT =<< renameLType t
diff --git a/src/Haddock/Types.hs b/src/Haddock/Types.hs
index 4c4587ac..6ae2309e 100644
--- a/src/Haddock/Types.hs
+++ b/src/Haddock/Types.hs
@@ -8,7 +8,7 @@
 
 module Haddock.Types where
 
-import GHC
+import GHC hiding (NoLink)
 import Outputable
 
 import Data.Map
diff --git a/src/Haddock/Utils.hs b/src/Haddock/Utils.hs
index 27f60e4a..a7f5f8a9 100644
--- a/src/Haddock/Utils.hs
+++ b/src/Haddock/Utils.hs
@@ -95,8 +95,8 @@ restrictCons names decls = [ L p d | L p (Just d) <- map (fmap keep) decls ]
           -- it's the best we can do.
         InfixCon _ _ -> Just d
       where
-        field_avail (HsRecField n _ _) = (unLoc n) `elem` names
-        field_types flds = [ ty | HsRecField n ty _ <- flds] 
+        field_avail (ConDeclField n _ _) = (unLoc n) `elem` names
+        field_types flds = [ t | ConDeclField _ t _ <- flds ] 
       
     keep d | otherwise = Nothing
 
diff --git a/src/Haddock/Version.hs b/src/Haddock/Version.hs
index f4d02b7d..3df24f1c 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_ghc ( version )
-import Data.Version      ( showVersion )
+import Paths_haddock ( version )
+import Data.Version  ( showVersion )
 
 projectName, projectUrl :: String
 projectName = "Haddock-GHC"