--- a/dmd/TypeidExp.d	Thu Sep 09 22:51:44 2010 +0100
+++ b/dmd/TypeidExp.d	Fri Sep 10 00:27:37 2010 +0100
@@ -8,10 +8,17 @@
 import dmd.Scope;
 import dmd.HdrGenState;
 import dmd.TOK;
+import dmd.Dsymbol;
+import dmd.TY;
+import dmd.Id;
+import dmd.ErrorExp;
+import dmd.DotIdExp;
+import dmd.CommaExp;
+import dmd.templates.Util;
 
 class TypeidExp : Expression
 {
-	Object *obj;
+	Object obj;
 
 	this(Loc loc, Object o)
 	{
@@ -60,10 +67,10 @@
 			return new ErrorExp();
 		}
 
-		if (ea && ta.toBasetype().ty == Tclass)
+		if (ea && ta.toBasetype().ty == TY.Tclass)
 		{   /* Get the dynamic type, which is .classinfo
 		 */
-			e = new DotIdExp(ea.loc, ea, Id.classinfo);
+			e = new DotIdExp(ea.loc, ea, Id.classinfo_);
 			e = e.semantic(sc);
 		}
 		else