diff --git a/include/core/SkUtils.h b/include/core/SkUtils.h
index b007b7711d..4e24bd0883 100644
--- a/include/core/SkUtils.h
+++ b/include/core/SkUtils.h
@@ -9,7 +9,11 @@
 #define SkUtils_DEFINED
 
 #include "SkTypes.h"
-#include "../private/SkOpts.h"
+
+namespace SkOpts {
+    extern void (*memset16)(uint16_t[], uint16_t, int);
+    extern void (*memset32)(uint32_t[], uint32_t, int);
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/include/private/SkOpts.h b/src/core/SkOpts.h
similarity index 100%
rename from include/private/SkOpts.h
rename to src/core/SkOpts.h