diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 499599c692..41bfdc689d 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -28,10 +28,10 @@
 #include "include/core/SkPictureRecorder.h"
 #include "include/core/SkString.h"
 #include "include/core/SkSurface.h"
-#include "include/private/SkLeanWindows.h"
 #include "src/core/SkAutoMalloc.h"
 #include "src/core/SkBBoxHierarchy.h"
 #include "src/core/SkColorSpacePriv.h"
+#include "src/core/SkLeanWindows.h"
 #include "src/core/SkOSFile.h"
 #include "src/core/SkTaskGroup.h"
 #include "src/core/SkTraceEvent.h"
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 90810a3280..41a220292f 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -18,11 +18,11 @@
 #include "include/ports/SkTypeface_win.h"
 #include "include/private/SkChecksum.h"
 #include "include/private/SkHalf.h"
-#include "include/private/SkLeanWindows.h"
 #include "include/private/SkMutex.h"
 #include "include/private/SkSpinlock.h"
 #include "include/private/SkTHash.h"
 #include "src/core/SkColorSpacePriv.h"
+#include "src/core/SkLeanWindows.h"
 #include "src/core/SkMD5.h"
 #include "src/core/SkOSFile.h"
 #include "src/core/SkTaskGroup.h"
diff --git a/include/ports/SkTypeface_win.h b/include/ports/SkTypeface_win.h
index 267ae016f0..f659adf0e9 100644
--- a/include/ports/SkTypeface_win.h
+++ b/include/ports/SkTypeface_win.h
@@ -9,10 +9,18 @@
 #define SkTypeface_win_DEFINED
 
 #include "include/core/SkTypeface.h"
-#include "include/private/SkLeanWindows.h"
+#include "include/core/SkTypes.h"
 
 #ifdef SK_BUILD_FOR_WIN
 
+#ifdef UNICODE
+typedef struct tagLOGFONTW LOGFONTW;
+typedef LOGFONTW LOGFONT;
+#else
+typedef struct tagLOGFONTA LOGFONTA;
+typedef LOGFONTA LOGFONT;
+#endif  // UNICODE
+
 /**
  *  Like the other Typeface create methods, this returns a new reference to the
  *  corresponding typeface for the specified logfont. The caller is responsible
diff --git a/src/core/SkExecutor.cpp b/src/core/SkExecutor.cpp
index 1812d30486..ce2ded28c7 100644
--- a/src/core/SkExecutor.cpp
+++ b/src/core/SkExecutor.cpp
@@ -15,7 +15,7 @@
 #include <thread>
 
 #if defined(SK_BUILD_FOR_WIN)
-    #include "include/private/SkLeanWindows.h"
+    #include "src/core/SkLeanWindows.h"
     static int num_cores() {
         SYSTEM_INFO sysinfo;
         GetNativeSystemInfo(&sysinfo);
diff --git a/include/private/SkLeanWindows.h b/src/core/SkLeanWindows.h
similarity index 100%
rename from include/private/SkLeanWindows.h
rename to src/core/SkLeanWindows.h
diff --git a/src/core/SkSemaphore.cpp b/src/core/SkSemaphore.cpp
index eba555d63b..15e7c65ec4 100644
--- a/src/core/SkSemaphore.cpp
+++ b/src/core/SkSemaphore.cpp
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#include "include/private/SkLeanWindows.h"
 #include "include/private/SkSemaphore.h"
+#include "src/core/SkLeanWindows.h"
 
 #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
     #include <mach/mach.h>
diff --git a/src/core/SkThreadID.cpp b/src/core/SkThreadID.cpp
index ff8dd6272d..e882834e72 100644
--- a/src/core/SkThreadID.cpp
+++ b/src/core/SkThreadID.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "include/private/SkLeanWindows.h"
 #include "include/private/SkThreadID.h"
 
 #ifdef SK_BUILD_FOR_WIN
+    #include "src/core/SkLeanWindows.h"
     SkThreadID SkGetThreadID() { return GetCurrentThreadId(); }
 #else
     #include <pthread.h>
diff --git a/src/core/SkTime.cpp b/src/core/SkTime.cpp
index 9626e76575..0db58b2123 100644
--- a/src/core/SkTime.cpp
+++ b/src/core/SkTime.cpp
@@ -9,8 +9,8 @@
 
 #include "include/core/SkString.h"
 #include "include/core/SkTypes.h"
-#include "include/private/SkLeanWindows.h"
 #include "include/private/SkTo.h"
+#include "src/core/SkLeanWindows.h"
 
 #include <chrono>
 
diff --git a/src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp b/src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp
index a1e6587f1e..e8d43a76f6 100644
--- a/src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp
+++ b/src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp
@@ -7,7 +7,7 @@
 #include "include/core/SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN)
 
-#include "include/private/SkLeanWindows.h"
+#include "src/core/SkLeanWindows.h"
 
 #include "include/gpu/gl/GrGLAssembleInterface.h"
 #include "include/gpu/gl/GrGLInterface.h"
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index f177d1866d..15130bf438 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -54,7 +54,7 @@
 #endif // !defined(SK_BUILD_FOR_WIN)
 
 #if defined(SK_BUILD_FOR_WIN) && defined(SK_DEBUG)
-#include "include/private/SkLeanWindows.h"
+#include "src/core/SkLeanWindows.h"
 #endif
 
 #define VK_CALL(X) GR_VK_CALL(this->vkInterface(), X)
diff --git a/src/ports/SkDebug_win.cpp b/src/ports/SkDebug_win.cpp
index 2ee665cfba..ce2c980555 100644
--- a/src/ports/SkDebug_win.cpp
+++ b/src/ports/SkDebug_win.cpp
@@ -9,7 +9,7 @@
 
 #if defined(SK_BUILD_FOR_WIN)
 
-#include "include/private/SkLeanWindows.h"
+#include "src/core/SkLeanWindows.h"
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp
index cc1a8615b8..0d35136d86 100644
--- a/src/ports/SkFontHost_win.cpp
+++ b/src/ports/SkFontHost_win.cpp
@@ -24,6 +24,7 @@
 #include "src/core/SkDescriptor.h"
 #include "src/core/SkFontDescriptor.h"
 #include "src/core/SkGlyph.h"
+#include "src/core/SkLeanWindows.h"
 #include "src/core/SkMakeUnique.h"
 #include "src/core/SkMaskGamma.h"
 #include "src/core/SkTypefaceCache.h"
diff --git a/src/ports/SkOSFile_win.cpp b/src/ports/SkOSFile_win.cpp
index aa3a930164..3dcdc1fb09 100644
--- a/src/ports/SkOSFile_win.cpp
+++ b/src/ports/SkOSFile_win.cpp
@@ -8,10 +8,10 @@
 #include "include/core/SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN)
 
-#include "include/private/SkLeanWindows.h"
 #include "include/private/SkMalloc.h"
 #include "include/private/SkNoncopyable.h"
 #include "include/private/SkTFitsIn.h"
+#include "src/core/SkLeanWindows.h"
 #include "src/core/SkOSFile.h"
 #include "src/core/SkStringUtils.h"
 
diff --git a/src/ports/SkOSLibrary_win.cpp b/src/ports/SkOSLibrary_win.cpp
index b948cf603d..6e19065f4b 100644
--- a/src/ports/SkOSLibrary_win.cpp
+++ b/src/ports/SkOSLibrary_win.cpp
@@ -7,7 +7,7 @@
 #include "include/core/SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN)
 
-#include "include/private/SkLeanWindows.h"
+#include "src/core/SkLeanWindows.h"
 #include "src/ports/SkOSLibrary.h"
 
 void* DynamicLoadLibrary(const char* libraryName) {
diff --git a/src/ports/SkTLS_win.cpp b/src/ports/SkTLS_win.cpp
index c3e852c1dd..39ba8c360c 100644
--- a/src/ports/SkTLS_win.cpp
+++ b/src/ports/SkTLS_win.cpp
@@ -7,8 +7,8 @@
 #include "include/core/SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN)
 
-#include "include/private/SkLeanWindows.h"
 #include "include/private/SkMutex.h"
+#include "src/core/SkLeanWindows.h"
 #include "src/core/SkTLS.h"
 
 static bool gOnce = false;
diff --git a/src/ports/SkTypeface_win_dw.h b/src/ports/SkTypeface_win_dw.h
index b95bc059be..b72fe553ba 100644
--- a/src/ports/SkTypeface_win_dw.h
+++ b/src/ports/SkTypeface_win_dw.h
@@ -9,8 +9,8 @@
 #define SkTypeface_win_dw_DEFINED
 
 #include "include/core/SkTypeface.h"
-#include "include/private/SkLeanWindows.h"
 #include "src/core/SkAdvancedTypefaceMetrics.h"
+#include "src/core/SkLeanWindows.h"
 #include "src/core/SkTypefaceCache.h"
 #include "src/utils/win/SkDWrite.h"
 #include "src/utils/win/SkHRESULT.h"
diff --git a/src/utils/win/SkAutoCoInitialize.h b/src/utils/win/SkAutoCoInitialize.h
index dcd720001d..592c2682d9 100644
--- a/src/utils/win/SkAutoCoInitialize.h
+++ b/src/utils/win/SkAutoCoInitialize.h
@@ -12,8 +12,8 @@
 
 #ifdef SK_BUILD_FOR_WIN
 
-#include "include/private/SkLeanWindows.h"
 #include "include/private/SkNoncopyable.h"
+#include "src/core/SkLeanWindows.h"
 
 /**
  * An instance of this class initializes COM on creation
diff --git a/src/utils/win/SkHRESULT.h b/src/utils/win/SkHRESULT.h
index 352866f339..80d046dfdc 100644
--- a/src/utils/win/SkHRESULT.h
+++ b/src/utils/win/SkHRESULT.h
@@ -11,7 +11,7 @@
 #include "include/core/SkTypes.h"
 #ifdef SK_BUILD_FOR_WIN
 
-#include "include/private/SkLeanWindows.h"
+#include "src/core/SkLeanWindows.h"
 
 void SkTraceHR(const char* file, unsigned long line,
                HRESULT hr, const char* msg);
diff --git a/src/utils/win/SkIStream.h b/src/utils/win/SkIStream.h
index 245d58f14a..186fb933bb 100644
--- a/src/utils/win/SkIStream.h
+++ b/src/utils/win/SkIStream.h
@@ -14,7 +14,7 @@
 
 #ifdef SK_BUILD_FOR_WIN
 
-#include "include/private/SkLeanWindows.h"
+#include "src/core/SkLeanWindows.h"
 #include <ole2.h>
 
 class SkStream;
diff --git a/src/utils/win/SkTScopedComPtr.h b/src/utils/win/SkTScopedComPtr.h
index aa5ce21a8f..2399d30a5b 100644
--- a/src/utils/win/SkTScopedComPtr.h
+++ b/src/utils/win/SkTScopedComPtr.h
@@ -8,7 +8,7 @@
 #ifndef SkTScopedComPtr_DEFINED
 #define SkTScopedComPtr_DEFINED
 
-#include "include/private/SkLeanWindows.h"
+#include "src/core/SkLeanWindows.h"
 
 #ifdef SK_BUILD_FOR_WIN
 
diff --git a/src/utils/win/SkWGL.h b/src/utils/win/SkWGL.h
index 1e396de704..3d347a0760 100644
--- a/src/utils/win/SkWGL.h
+++ b/src/utils/win/SkWGL.h
@@ -10,7 +10,7 @@
 #ifndef SkWGL_DEFINED
 #define SkWGL_DEFINED
 
-#include "include/private/SkLeanWindows.h"
+#include "src/core/SkLeanWindows.h"
 
 /**
  * Working with WGL extensions can be a pain. Among the reasons is that You must
diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp
index cd619b3e11..46bf6c110b 100644
--- a/src/xps/SkXPSDevice.cpp
+++ b/src/xps/SkXPSDevice.cpp
@@ -8,7 +8,7 @@
 #include "include/core/SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN)
 
-#include "include/private/SkLeanWindows.h"
+#include "src/core/SkLeanWindows.h"
 
 #ifndef UNICODE
 #define UNICODE
diff --git a/tests/TracingTest.cpp b/tests/TracingTest.cpp
index 49540b2538..4abd712685 100644
--- a/tests/TracingTest.cpp
+++ b/tests/TracingTest.cpp
@@ -8,7 +8,7 @@
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkPoint.h"
 #include "include/core/SkRect.h"
-#include "include/private/SkLeanWindows.h"
+#include "src/core/SkLeanWindows.h"
 #include "src/core/SkTraceEvent.h"
 #include "tests/Test.h"
 #include "tools/flags/CommandLineFlags.h"
diff --git a/tools/CrashHandler.cpp b/tools/CrashHandler.cpp
index fcaca2aef5..5a2186f6d5 100644
--- a/tools/CrashHandler.cpp
+++ b/tools/CrashHandler.cpp
@@ -7,7 +7,7 @@
 
 #include "tools/CrashHandler.h"
 
-#include "include/private/SkLeanWindows.h"
+#include "src/core/SkLeanWindows.h"
 
 #include <stdlib.h>