diff --git a/dmd2/arraytypes.h b/dmd2/arraytypes.h
index 48efab11..d260604d 100644
--- a/dmd2/arraytypes.h
+++ b/dmd2/arraytypes.h
@@ -24,7 +24,7 @@ typedef Array<class Expression> Expressions;
 
 typedef Array<class Statement> Statements;
 
-typedef Array<class BaseClass> BaseClasses;
+typedef Array<struct BaseClass> BaseClasses;
 
 typedef Array<class ClassDeclaration> ClassDeclarations;
 
diff --git a/gen/utils.h b/gen/utils.h
index 4e3828dc..8d0fc61e 100644
--- a/gen/utils.h
+++ b/gen/utils.h
@@ -74,9 +74,9 @@ struct ArrayIter
 };
 
 // From dsymbol.h / declaration.h
-struct Dsymbol;
-struct FuncDeclaration;
-struct VarDeclaration;
+class Dsymbol;
+class FuncDeclaration;
+class VarDeclaration;
 
 // some aliases
 typedef ArrayIter<Dsymbol> DsymbolIter;