--- a/dmd2/dsymbol.h	Tue Aug 25 21:35:43 2009 +0200
+++ b/dmd2/dsymbol.h	Tue Sep 08 10:07:56 2009 +0100
@@ -62,6 +62,7 @@
 struct TypeTuple;
 struct WithStatement;
 struct LabelDsymbol;
+struct ScopeDsymbol;
 struct TemplateDeclaration;
 struct TemplateInstance;
 struct TemplateMixin;
@@ -130,7 +131,6 @@
     Dsymbol();
     Dsymbol(Identifier *);
     char *toChars();
-    char *toPrettyChars();
     char *locToChars();
     int equals(Object *o);
     int isAnonymous();
@@ -148,6 +148,7 @@
 
     static Array *arraySyntaxCopy(Array *a);
 
+    virtual const char *toPrettyChars();
     virtual const char *kind();
     virtual Dsymbol *toAlias();			// resolve real symbol
     virtual int addMember(Scope *sc, ScopeDsymbol *s, int memnum);
@@ -173,7 +174,9 @@
     virtual int isExport();			// is Dsymbol exported?
     virtual int isImportedSymbol();		// is Dsymbol imported?
     virtual int isDeprecated();			// is Dsymbol deprecated?
+#if DMDV2
     virtual int isOverloadable();
+#endif
     virtual LabelDsymbol *isLabel();		// is this a LabelDsymbol?
     virtual AggregateDeclaration *isMember();	// is this symbol a member of an AggregateDeclaration?
     virtual Type *getType();			// is this a type?
@@ -322,6 +325,7 @@
 
 // Overload Sets
 
+#if DMDV2
 struct OverloadSet : Dsymbol
 {
     Dsymbols a;		// array of Dsymbols
@@ -331,6 +335,7 @@
     OverloadSet *isOverloadSet() { return this; }
     const char *kind();
 };
+#endif
 
 // Table of Dsymbol's