Different fixes for d2

dmd2/aggregate.h

@@ -41,6 +41,7 @@ struct VarDeclaration;
 struct dt_t;
 
 #if IN_LLVM
+class ClassInfoDeclaration;
 namespace llvm
 {
     class Type;
@@ -251,7 +252,6 @@ struct ClassDeclaration : AggregateDeclaration
 
     BaseClasses *vtblInterfaces;        // array of base interfaces that have
                                         // their own vtbl[]
-
     TypeInfoClassDeclaration *vclassinfo;       // the ClassInfo object for this ClassDeclaration
     int com;                            // !=0 if this is a COM class (meaning
                                         // it derives from IUnknown)