SkRefCnt, SkTypes: fix includes for clients

Change-Id: I1cfdc03963eaab9687608974958d20411806cfeb
Reviewed-on: https://skia-review.googlesource.com/136592
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h
index d561e99..89e6544 100644
--- a/include/core/SkRefCnt.h
+++ b/include/core/SkRefCnt.h
@@ -13,11 +13,14 @@
 #include <atomic>
 #include <cstddef>
 #include <functional>
-#include <memory>
 #include <ostream>
 #include <type_traits>
 #include <utility>
 
+// These two headers will be removed in a later CL:
+#include <memory>
+#include <array>
+
 /** \class SkRefCntBase
 
     SkRefCntBase is the base class for objects that may be shared by multiple
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index be51e20..395211a 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -16,6 +16,8 @@
 #include <stdint.h>
 // IWYU pragma: end_exports
 
+#include <utility>
+
 /** \file SkTypes.h
 */