diff --git a/make/sun/font/Makefile b/make/sun/font/Makefile
index 385e20282703b5065255e501a0403629e4f00c76..f797a5ba010d0fdf77ec4aed1e624832abff357a 100644
--- a/make/sun/font/Makefile
+++ b/make/sun/font/Makefile
@@ -62,7 +62,7 @@ FILES_export = \
     java/text/Bidi.java \
     sun/font/FileFont.java \
     sun/font/FileFontStrike.java \
-    sun/font/FontManager.java \
+    sun/font/SunFontManager.java \
     sun/font/GlyphList.java \
     sun/font/NativeFont.java \
     sun/font/StrikeCache.java \
diff --git a/make/sun/font/t2k/Makefile b/make/sun/font/t2k/Makefile
index 71903e0f774b5d184406eb630870b90bce5aa3a8..0827baf89c99c65c37d887eb76ee9016044fd8dc 100644
--- a/make/sun/font/t2k/Makefile
+++ b/make/sun/font/t2k/Makefile
@@ -52,7 +52,6 @@ include FILES_c.gmk
 FILES_export = \
     java/awt/Font.java \
     sun/font/FileFont.java \
-    sun/font/FontManager.java \
     sun/font/GlyphList.java \
     sun/font/NativeFont.java \
     sun/font/StrikeCache.java \
diff --git a/src/share/native/sun/font/sunFont.c b/src/share/native/sun/font/sunFont.c
index e6ce37f6b772ae243b2cfb6714a4ac3070abb0f3..cfcc5ed75c0366c99df6a12845b60f4e57cf80f7 100644
--- a/src/share/native/sun/font/sunFont.c
+++ b/src/share/native/sun/font/sunFont.c
@@ -29,7 +29,7 @@
 #include "jlong.h"
 #include "sunfontids.h"
 #include "fontscalerdefs.h"
-#include "sun_font_FontManager.h"
+#include "sun_font_SunFontManager.h"
 #include "sun_font_NullFontScaler.h"
 #include "sun_font_StrikeCache.h"