6 files changed, 9 insertions, 11 deletions
diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp
index 9c300ab502..06288b2ab3 100644
--- a/gm/fontmgr.cpp
+++ b/gm/fontmgr.cpp
@@ -12,8 +12,7 @@
 #include "SkTypeface.h"
 
 #ifdef SK_BUILD_FOR_WIN
-    extern SkFontMgr* SkFontMgr_New_GDI();
-    extern SkFontMgr* SkFontMgr_New_DirectWrite();
+    #include "SkTypeface_win.h"
 #endif
 
 // limit this just so we don't take too long to draw
diff --git a/include/ports/SkTypeface_win.h b/include/ports/SkTypeface_win.h
index fea5f474a0..e7dd4ab50a 100644
--- a/include/ports/SkTypeface_win.h
+++ b/include/ports/SkTypeface_win.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -6,8 +5,6 @@
  * found in the LICENSE file.
  */
 
-
-
 #ifndef SkTypeface_win_DEFINED
 #define SkTypeface_win_DEFINED
 
@@ -36,4 +33,10 @@ SK_API void SkLOGFONTFromTypeface(const SkTypeface* typeface, LOGFONT* lf);
   */
 SK_API void SkTypeface_SetEnsureLOGFONTAccessibleProc(void (*)(const LOGFONT&));
 
+// Experimental!
+//
+class SkFontMgr;
+SK_API SkFontMgr* SkFontMgr_New_GDI();
+SK_API SkFontMgr* SkFontMgr_New_DirectWrite();
+
 #endif
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp
index 7ba14aac4f..4bce8b04c3 100755
--- a/src/ports/SkFontHost_win.cpp
+++ b/src/ports/SkFontHost_win.cpp
@@ -2391,7 +2391,6 @@ SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
 
 #endif
 
-extern SkFontMgr* SkFontMgr_New_GDI();
 SkFontMgr* SkFontMgr_New_GDI() {
     return SkNEW(SkFontMgrGDI);
 }
diff --git a/src/ports/SkFontHost_win_dw.cpp b/src/ports/SkFontHost_win_dw.cpp
index 41a06f1ece..cc9674e946 100644
--- a/src/ports/SkFontHost_win_dw.cpp
+++ b/src/ports/SkFontHost_win_dw.cpp
@@ -1899,7 +1899,6 @@ static HRESULT GetGetUserDefaultLocaleNameProc(GetUserDefaultLocaleNameProc* pro
     return S_OK;
 }
 
-extern SkFontMgr* SkFontMgr_New_DirectWrite();
 SkFontMgr* SkFontMgr_New_DirectWrite() {
     IDWriteFactory* factory;
     HRNM(get_dwrite_factory(&factory), "Could not get factory.");
diff --git a/src/ports/SkFontMgr_default_dw.cpp b/src/ports/SkFontMgr_default_dw.cpp
index 3e09446e48..e9ad295d6d 100644
--- a/src/ports/SkFontMgr_default_dw.cpp
+++ b/src/ports/SkFontMgr_default_dw.cpp
@@ -1,6 +1,5 @@
 #include "SkFontMgr.h"
-
-extern SkFontMgr* SkFontMgr_New_DirectWrite();
+#include "SkTypeface_win.h"
 
 SkFontMgr* SkFontMgr::Factory() {
     return SkFontMgr_New_DirectWrite();
diff --git a/src/ports/SkFontMgr_default_gdi.cpp b/src/ports/SkFontMgr_default_gdi.cpp
index 243d0cc983..c39ab81120 100644
--- a/src/ports/SkFontMgr_default_gdi.cpp
+++ b/src/ports/SkFontMgr_default_gdi.cpp
@@ -1,6 +1,5 @@
 #include "SkFontMgr.h"
-
-extern SkFontMgr* SkFontMgr_New_GDI();
+#include "SkTypeface_win.h"
 
 SkFontMgr* SkFontMgr::Factory() {
     return SkFontMgr_New_GDI();