3 files changed, 3 insertions, 2 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 443b4e39f4..e35fc96383 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -81,6 +81,7 @@ skia_public_includes = [
   "include/config",
   "include/core",
   "include/effects",
+  "include/encode",
   "include/gpu",
   "include/gpu/gl",
   "include/pathops",
diff --git a/src/images/SkEncoder.h b/include/encode/SkEncoder.h
index e2686adb27..d1b99fd5af 100644
--- a/src/images/SkEncoder.h
+++ b/include/encode/SkEncoder.h
@@ -9,7 +9,7 @@
 #define SkEncoder_DEFINED
 
 #include "SkPixmap.h"
-#include "SkTemplates.h"
+#include "../private/SkTemplates.h"
 
 class SkEncoder : SkNoncopyable {
 public:
diff --git a/src/images/SkPngEncoder.h b/include/encode/SkPngEncoder.h
index 0664c06149..adcc061113 100644
--- a/src/images/SkPngEncoder.h
+++ b/include/encode/SkPngEncoder.h
@@ -13,7 +13,7 @@
 class SkPngEncoderMgr;
 class SkWStream;
 
-class SkPngEncoder : public SkEncoder {
+class SK_API SkPngEncoder : public SkEncoder {
 public:
 
     enum class FilterFlag : int {