--- a/dmd/StructDeclaration.d	Sat Sep 11 13:03:39 2010 +0100
+++ b/dmd/StructDeclaration.d	Mon Sep 13 22:19:42 2010 +0100
@@ -207,7 +207,22 @@
 		sc2.protection = PROT.PROTpublic;
 		sc2.explicitProtection = 0;
 
-		int members_dim = members.dim;
+
+        /* Set scope so if there are forward references, we still might be able to
+         * resolve individual members like enums.
+         */
+        foreach (s; members)
+        {
+	        /* There are problems doing this in the general case because
+	         * Scope keeps track of things like 'offset'
+	         */
+	        if (s.isEnumDeclaration() || (s.isAggregateDeclaration() && s.ident))
+	        {
+	            //printf("setScope %s %s\n", s->kind(), s->toChars());
+	            s.setScope(sc2);
+	        }
+        }
+
 		foreach(Dsymbol s; members)
 		{
 			s.semantic(sc2);
@@ -412,6 +427,22 @@
 		}
 	}
 	
+    Dsymbol search(Loc loc, Identifier ident, int flags)
+    {
+        //printf("%s.StructDeclaration::search('%s')\n", toChars(), ident->toChars());
+
+        if (scope_)
+    	    semantic(scope_);
+
+        if (!members || !symtab)
+        {
+    	    error("is forward referenced when looking for '%s'", ident.toChars());
+	        return null;
+        }
+
+        return ScopeDsymbol.search(loc, ident, flags);
+    }
+
     override void toCBuffer(OutBuffer buf, HdrGenState* hgs)
 	{
 		assert(false);