Add missing #includes.

These headers are referenced without being directly #included. This was
noticed during a refactor.

Change-Id: I23420f1f2d02a428721b57d3195dae550effefa1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/306319
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/src/core/SkImageFilter_Base.h b/src/core/SkImageFilter_Base.h
index 5837e5e..a2b8db4 100644
--- a/src/core/SkImageFilter_Base.h
+++ b/src/core/SkImageFilter_Base.h
@@ -12,6 +12,7 @@
 #include "include/core/SkImageFilter.h"
 #include "include/core/SkImageInfo.h"
 #include "include/private/SkTArray.h"
+#include "include/private/SkTemplates.h"
 
 #include "src/core/SkImageFilterTypes.h"
 
diff --git a/tools/gpu/vk/VkTestUtils.cpp b/tools/gpu/vk/VkTestUtils.cpp
index 4a1f33d..bf06b1e 100644
--- a/tools/gpu/vk/VkTestUtils.cpp
+++ b/tools/gpu/vk/VkTestUtils.cpp
@@ -17,6 +17,8 @@
     #endif
 #endif
 
+#include <algorithm>
+
 #if defined(SK_BUILD_FOR_UNIX)
 #include <execinfo.h>
 #endif