diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index 1424131..bbf6431 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -23,7 +23,7 @@
     !defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_MAC)
 
     #ifdef __APPLE__
-        #include "TargetConditionals.h"
+        #include <TargetConditionals.h>
     #endif
 
     #if defined(_WIN32) || defined(__SYMBIAN32__)
diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp
index 827263b..b11c679 100644
--- a/src/codec/SkPngCodec.cpp
+++ b/src/codec/SkPngCodec.cpp
@@ -21,7 +21,7 @@
 #include "src/codec/SkSwizzler.h"
 #include "src/core/SkOpts.h"
 
-#include "png.h"
+#include <png.h>
 #include <algorithm>
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
diff --git a/src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp b/src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp
index 0410887..6f8736f 100644
--- a/src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp
+++ b/src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp
@@ -20,10 +20,10 @@
 #else
 
 // Located https://github.com/emscripten-core/emscripten/tree/7ba7700902c46734987585409502f3c63beb650f/system/include/webgl
-#include "webgl/webgl1.h"
-#include "webgl/webgl1_ext.h"
-#include "webgl/webgl2.h"
-#include "webgl/webgl2_ext.h"
+#include <webgl/webgl1.h>
+#include <webgl/webgl1_ext.h>
+#include <webgl/webgl2.h>
+#include <webgl/webgl2_ext.h>
 
 #define GET_PROC(F) functions->f##F = emscripten_gl##F
 #define GET_PROC_SUFFIX(F, S) functions->f##F = emscripten_gl##F##S
diff --git a/src/gpu/gl/webgl/GrGLMakeNativeInterface_webgl.cpp b/src/gpu/gl/webgl/GrGLMakeNativeInterface_webgl.cpp
index 59404f1..79816a9 100644
--- a/src/gpu/gl/webgl/GrGLMakeNativeInterface_webgl.cpp
+++ b/src/gpu/gl/webgl/GrGLMakeNativeInterface_webgl.cpp
@@ -7,11 +7,11 @@
 #include "include/gpu/gl/GrGLAssembleInterface.h"
 #include "include/gpu/gl/GrGLInterface.h"
 
-#include "emscripten/html5.h"
-#include "webgl/webgl1.h"
-#include "webgl/webgl1_ext.h"
-#include "webgl/webgl2.h"
-#include "webgl/webgl2_ext.h"
+#include <emscripten/html5.h>
+#include <webgl/webgl1.h>
+#include <webgl/webgl1_ext.h>
+#include <webgl/webgl2.h>
+#include <webgl/webgl2_ext.h>
 
 static GrGLFuncPtr webgl_get_gl_proc(void* ctx, const char name[]) {
 
diff --git a/src/images/SkPngEncoder.cpp b/src/images/SkPngEncoder.cpp
index 2cf3ba4..13d8534 100644
--- a/src/images/SkPngEncoder.cpp
+++ b/src/images/SkPngEncoder.cpp
@@ -19,7 +19,7 @@
 #include "src/images/SkImageEncoderFns.h"
 #include <vector>
 
-#include "png.h"
+#include <png.h>
 
 static_assert(PNG_FILTER_NONE  == (int)SkPngEncoder::FilterFlag::kNone,  "Skia libpng filter err.");
 static_assert(PNG_FILTER_SUB   == (int)SkPngEncoder::FilterFlag::kSub,   "Skia libpng filter err.");
diff --git a/src/ports/SkFontHost_FreeType_common.cpp b/src/ports/SkFontHost_FreeType_common.cpp
index e204c83..6cb03d9 100644
--- a/src/ports/SkFontHost_FreeType_common.cpp
+++ b/src/ports/SkFontHost_FreeType_common.cpp
@@ -19,16 +19,16 @@
 #include <utility>
 
 #include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_BITMAP_H
+#include <freetype/freetype.h>
+#include <freetype/ftbitmap.h>
 #ifdef FT_COLOR_H
-#   include FT_COLOR_H
+#   include <freetype/ftcolor.h>
 #endif
-#include FT_IMAGE_H
-#include FT_OUTLINE_H
-#include FT_SIZES_H
+#include <freetype/ftimage.h>
+#include <freetype/ftoutln.h>
+#include <freetype/ftsizes.h>
 // In the past, FT_GlyphSlot_Own_Bitmap was defined in this header file.
-#include FT_SYNTHESIS_H
+#include <freetype/ftsynth.h>
 
 #ifdef TT_SUPPORT_COLRV1
 #include "src/core/SkScopeExit.h"
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp
index 2d7f79e..b4e6538 100644
--- a/tests/CodecTest.cpp
+++ b/tests/CodecTest.cpp
@@ -49,7 +49,7 @@
 #include "tools/Resources.h"
 #include "tools/ToolUtils.h"
 
-#include "png.h"
+#include <png.h>
 
 #include <setjmp.h>
 #include <cstring>
diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp
index 926d8a6..219343c 100644
--- a/tests/ColorSpaceTest.cpp
+++ b/tests/ColorSpaceTest.cpp
@@ -17,7 +17,7 @@
 #include "tests/Test.h"
 #include "tools/Resources.h"
 
-#include "png.h"
+#include <png.h>
 
 #include <string.h>
 #include <memory>
diff --git a/tests/EncodeTest.cpp b/tests/EncodeTest.cpp
index 0d5ea8a..c5f7937 100644
--- a/tests/EncodeTest.cpp
+++ b/tests/EncodeTest.cpp
@@ -20,7 +20,7 @@
 #include "include/encode/SkWebpEncoder.h"
 #include "include/private/SkImageInfoPriv.h"
 
-#include "png.h"
+#include <png.h>
 
 #include <algorithm>
 #include <string>
diff --git a/tools/HashAndEncode.cpp b/tools/HashAndEncode.cpp
index 9e7a8a1..e9c9dfb 100644
--- a/tools/HashAndEncode.cpp
+++ b/tools/HashAndEncode.cpp
@@ -4,7 +4,8 @@
 #include "include/core/SkICC.h"
 #include "include/core/SkString.h"
 #include "tools/HashAndEncode.h"
-#include "png.h"
+
+#include <png.h>
 
 static sk_sp<SkColorSpace> rec2020() {
     return SkColorSpace::MakeRGB(SkNamedTransferFn::kRec2020, SkNamedGamut::kRec2020);