6 files changed, 10 insertions, 8 deletions
diff --git a/src/ports/SkDebug_win.cpp b/src/ports/SkDebug_win.cpp
index b0c5725a79..da1e2b573f 100644
--- a/src/ports/SkDebug_win.cpp
+++ b/src/ports/SkDebug_win.cpp
@@ -5,16 +5,16 @@
  * found in the LICENSE file.
  */
 
-
-
 #include "SkTypes.h"
+
 #if defined(SK_BUILD_FOR_WIN32)
 
-static const size_t kBufferSize = 2048;
+#include "SkLeanWindows.h"
 
 #include <stdarg.h>
 #include <stdio.h>
-#include <windows.h>
+
+static const size_t kBufferSize = 2048;
 
 void SkDebugf(const char format[], ...) {
     char    buffer[kBufferSize + 1];
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index 0cc436f7c3..c129a6b24b 100644
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -29,6 +29,7 @@
 #include "SkFontMgr.h"
 #include "SkGlyph.h"
 #include "SkMaskGamma.h"
+#include "SkMathPriv.h"
 #include "SkMutex.h"
 #include "SkOTTable_glyf.h"
 #include "SkOTTable_head.h"
diff --git a/src/ports/SkOSFile_win.cpp b/src/ports/SkOSFile_win.cpp
index 6bdf9ab163..cf46cea985 100644
--- a/src/ports/SkOSFile_win.cpp
+++ b/src/ports/SkOSFile_win.cpp
@@ -8,8 +8,8 @@
 #include "SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN32)
 
+#include "SkLeanWindows.h"
 #include "SkOSFile.h"
-
 #include "SkTFitsIn.h"
 
 #include <io.h>
diff --git a/src/ports/SkOSLibrary_win.cpp b/src/ports/SkOSLibrary_win.cpp
index 63d8d2d383..b6d8dd3183 100644
--- a/src/ports/SkOSLibrary_win.cpp
+++ b/src/ports/SkOSLibrary_win.cpp
@@ -8,7 +8,7 @@
 #if defined(SK_BUILD_FOR_WIN32)
 
 #include "SkOSLibrary.h"
-#include <windows.h>
+#include "SkLeanWindows.h"
 
 void* DynamicLoadLibrary(const char* libraryName) {
     return LoadLibraryA(libraryName);
diff --git a/src/ports/SkTLS_win.cpp b/src/ports/SkTLS_win.cpp
index 8bc55a0f2c..c349ad99c2 100644
--- a/src/ports/SkTLS_win.cpp
+++ b/src/ports/SkTLS_win.cpp
@@ -7,8 +7,9 @@
 #include "SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN32)
 
-#include "SkTLS.h"
+#include "SkLeanWindows.h"
 #include "SkMutex.h"
+#include "SkTLS.h"
 
 static bool gOnce = false;
 static DWORD gTlsIndex;
diff --git a/src/ports/SkTypeface_win_dw.h b/src/ports/SkTypeface_win_dw.h
index 3e429f47cb..11b3fb5ffc 100644
--- a/src/ports/SkTypeface_win_dw.h
+++ b/src/ports/SkTypeface_win_dw.h
@@ -11,10 +11,10 @@
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkDWrite.h"
 #include "SkHRESULT.h"
+#include "SkLeanWindows.h"
 #include "SkTScopedComPtr.h"
 #include "SkTypeface.h"
 #include "SkTypefaceCache.h"
-#include "SkTypes.h"
 
 #include <dwrite.h>
 #if SK_HAS_DWRITE_1_H