9 files changed, 23 insertions, 10 deletions
diff --git a/include/core/SkColorPriv.h b/include/core/SkColorPriv.h
index 188ce6a172..0cd02e8034 100644
--- a/include/core/SkColorPriv.h
+++ b/include/core/SkColorPriv.h
@@ -8,7 +8,6 @@
 #ifndef SkColorPriv_DEFINED
 #define SkColorPriv_DEFINED
 
-#include "../private/SkTo.h"
 #include "SkColor.h"
 #include "SkMath.h"
 
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h
index 80a51cf242..f09b8d6b03 100644
--- a/include/core/SkImageInfo.h
+++ b/include/core/SkImageInfo.h
@@ -22,9 +22,7 @@
 #include "SkMath.h"
 #include "SkRect.h"
 #include "SkSize.h"
-
 #include "../private/SkTFitsIn.h"
-#include "../private/SkTo.h"
 
 class SkReadBuffer;
 class SkWriteBuffer;
diff --git a/include/core/SkMath.h b/include/core/SkMath.h
index 19ab2f8c68..fb551abb40 100644
--- a/include/core/SkMath.h
+++ b/include/core/SkMath.h
@@ -1,3 +1,4 @@
+
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -9,7 +10,6 @@
 #ifndef SkMath_DEFINED
 #define SkMath_DEFINED
 
-#include "../private/SkTo.h"
 #include "SkTypes.h"
 
 // 64bit -> 32bit utilities
diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h
index 84f805c637..4fadf984a4 100644
--- a/include/core/SkMatrix.h
+++ b/include/core/SkMatrix.h
@@ -19,7 +19,6 @@
 #define SkMatrix_DEFINED
 
 #include "../private/SkMacros.h"
-#include "../private/SkTo.h"
 #include "SkRect.h"
 
 struct SkRSXform;
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 3d471d15ff..4c82e50f00 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -18,7 +18,6 @@
 #ifndef SkPaint_DEFINED
 #define SkPaint_DEFINED
 
-#include "../private/SkTo.h"
 #include "SkBlendMode.h"
 #include "SkColor.h"
 #include "SkFilterQuality.h"
diff --git a/include/core/SkPath.h b/include/core/SkPath.h
index 9906827ba8..64ab531536 100644
--- a/include/core/SkPath.h
+++ b/include/core/SkPath.h
@@ -20,7 +20,6 @@
 
 #include "SkMatrix.h"
 #include "../private/SkPathRef.h"
-#include "../private/SkTo.h"
 
 class SkAutoPathBoundsUpdate;
 class SkData;
diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index d73c8a097e..2d9f9db120 100644
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -8,7 +8,6 @@
 #ifndef SkStream_DEFINED
 #define SkStream_DEFINED
 
-#include "../private/SkTo.h"
 #include "SkData.h"
 #include "SkRefCnt.h"
 #include "SkScalar.h"
diff --git a/include/core/SkString.h b/include/core/SkString.h
index aa3292abfe..c2fd9c0e36 100644
--- a/include/core/SkString.h
+++ b/include/core/SkString.h
@@ -1,3 +1,4 @@
+
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -10,9 +11,8 @@
 #define SkString_DEFINED
 
 #include "../private/SkTArray.h"
-#include "../private/SkTo.h"
-#include "SkRefCnt.h"
 #include "SkScalar.h"
+#include "SkRefCnt.h"
 
 #include <atomic>
 #include <stdarg.h>
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index ba747ef2f1..3e9dea6b21 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -102,6 +102,26 @@ typedef int S16CPU;
  */
 typedef unsigned U16CPU;
 
+/**
+ *  Meant to be a small version of bool, for storage purposes. Will be 0 or 1
+ */
+typedef uint8_t SkBool8;
+
+#include "../private/SkTFitsIn.h"
+template <typename D, typename S> constexpr D SkTo(S s) {
+    return SkASSERT(SkTFitsIn<D>(s)),
+           static_cast<D>(s);
+}
+#define SkToS8(x)    SkTo<int8_t>(x)
+#define SkToU8(x)    SkTo<uint8_t>(x)
+#define SkToS16(x)   SkTo<int16_t>(x)
+#define SkToU16(x)   SkTo<uint16_t>(x)
+#define SkToS32(x)   SkTo<int32_t>(x)
+#define SkToU32(x)   SkTo<uint32_t>(x)
+#define SkToInt(x)   SkTo<int>(x)
+#define SkToUInt(x)  SkTo<unsigned>(x)
+#define SkToSizeT(x) SkTo<size_t>(x)
+
 /** Returns 0 or 1 based on the condition
 */
 #define SkToBool(cond)  ((cond) != 0)