diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h
index 5227323e3a..87868789df 100644
--- a/include/core/SkRefCnt.h
+++ b/include/core/SkRefCnt.h
@@ -13,8 +13,8 @@
 #include <atomic>
 #include <cstddef>
 #include <functional>
+#include <iosfwd>
 #include <memory>
-#include <ostream>
 #include <type_traits>
 #include <utility>
 
diff --git a/modules/skottie/src/SkottieTest.cpp b/modules/skottie/src/SkottieTest.cpp
index 717c609d56..29124a27b5 100644
--- a/modules/skottie/src/SkottieTest.cpp
+++ b/modules/skottie/src/SkottieTest.cpp
@@ -19,6 +19,7 @@
 #include "tools/ToolUtils.h"
 
 #include <cmath>
+#include <string>
 #include <tuple>
 #include <vector>
 
diff --git a/modules/skparagraph/include/ParagraphStyle.h b/modules/skparagraph/include/ParagraphStyle.h
index b6f3b055d4..69a0596f35 100644
--- a/modules/skparagraph/include/ParagraphStyle.h
+++ b/modules/skparagraph/include/ParagraphStyle.h
@@ -5,6 +5,7 @@
 #include "include/core/SkFontStyle.h"
 #include "modules/skparagraph/include/DartTypes.h"
 #include "modules/skparagraph/include/TextStyle.h"
+#include <string>  // std::u16string
 
 namespace skia {
 namespace textlayout {
diff --git a/src/core/SkVM.cpp b/src/core/SkVM.cpp
index 0c3ffa098a..a1b8a99bad 100644
--- a/src/core/SkVM.cpp
+++ b/src/core/SkVM.cpp
@@ -15,6 +15,10 @@
 #if defined(SKVM_JIT)
     #include <sys/mman.h>
 #endif
+#if defined(SKVM_PERF_DUMPS)
+    #include <stdio.h>
+    #include <time.h>
+#endif
 
 namespace skvm {