diff --git a/ghc/compiler/codeGen/ClosureInfo.lhs b/ghc/compiler/codeGen/ClosureInfo.lhs
index 30b046266983ed648fd956d0d6b452df26496302..7bade99388668f5b44aab4d384c500786ac40a8a 100644
--- a/ghc/compiler/codeGen/ClosureInfo.lhs
+++ b/ghc/compiler/codeGen/ClosureInfo.lhs
@@ -56,7 +56,9 @@ IMP_Ubiq(){-uitous-}
 IMPORT_DELOOPER(AbsCLoop)		-- here for paranoia-checking
 #endif
 
-import AbsCSyn
+import AbsCSyn		( MagicId, node, mkLiveRegsMask,
+			  {- GHC 0.29 only -} AbstractC, CAddrMode
+			)
 import StgSyn
 import CgMonad
 
diff --git a/ghc/compiler/typecheck/TcInstDcls.lhs b/ghc/compiler/typecheck/TcInstDcls.lhs
index 59d628416bb8832e2413184fb77a90ee09fffe10..1dd90a37797c7d97aa232f7d519b933febf2b1a4 100644
--- a/ghc/compiler/typecheck/TcInstDcls.lhs
+++ b/ghc/compiler/typecheck/TcInstDcls.lhs
@@ -29,7 +29,7 @@ import RnHsSyn		( SYN_IE(RenamedHsBinds), SYN_IE(RenamedMonoBinds),
 			  SYN_IE(RenamedInstDecl), SYN_IE(RenamedFixityDecl), SYN_IE(RenamedHsExpr),
 			  SYN_IE(RenamedSig), SYN_IE(RenamedSpecInstSig), SYN_IE(RenamedHsDecl)
 			)
-import TcHsSyn		( TcIdOcc(..), SYN_IE(TcIdBndr), SYN_IE(TcHsBinds),
+import TcHsSyn		( SYN_IE(TcHsBinds),
 			  SYN_IE(TcMonoBinds), SYN_IE(TcExpr), tcIdType,
 			  mkHsTyLam, mkHsTyApp,
 			  mkHsDictLam, mkHsDictApp )
@@ -51,7 +51,7 @@ import TcKind		( TcKind, unifyKind )
 import TcMatches	( tcMatchesFun )
 import TcMonoType	( tcTyVarScope, tcContext, tcHsTypeKind )
 import TcSimplify	( tcSimplifyAndCheck )
-import TcType		( SYN_IE(TcType), SYN_IE(TcTyVar), SYN_IE(TcTyVarSet), 
+import TcType		( TcIdOcc(..), SYN_IE(TcIdBndr), SYN_IE(TcType), SYN_IE(TcTyVar), SYN_IE(TcTyVarSet), 
 			  tcInstSigTyVars, tcInstType, tcInstSigTcType, 
 			  tcInstTheta, tcInstTcType, tcInstSigType
 			)