The fix of 7159136 substituted a new JNI header sun_font_SunFontManager.h instead of old sun_font_FontManager.h and changed corresponding includes. However somewhere the old one is still generated and included: a find call on the build tree yields
tmp/sun/sun.awt/awt/CClassHeaders/sun_font_FontManager.h
tmp/sun/sun.awt/awt_headless/CClassHeaders/sun_font_FontManager.h
and (on Mac)
tmp/sun/sun.lwawt/awt_lwawt/CClassHeaders/sun_font_FontManager.h
and src/solaris/native/sun/awt/fontpath.h does include the old header.
Perhaps eventually it should be fixed as well.