diff -r 31d6ce8d9edb -r c33507c3ac75 hotspot/src/share/vm/classfile/systemDictionary.hpp
--- a/hotspot/src/share/vm/classfile/systemDictionary.hpp	Fri May 09 05:26:59 2008 -0700
+++ b/hotspot/src/share/vm/classfile/systemDictionary.hpp	Wed May 14 00:41:06 2008 -0700
@@ -386,7 +386,7 @@
   #undef WK_KLASS_DECLARE
 
   // Local definition for direct access to the private array:
-  #define WK_KLASS(name) _well_known_klasses[WK_KLASS_ENUM_NAME(name)]
+  #define WK_KLASS(name) _well_known_klasses[SystemDictionary::WK_KLASS_ENUM_NAME(name)]
 
   static klassOop box_klass(BasicType t) {
     assert((uint)t < T_VOID+1, "range check");