diff --git a/docs/undocumented.bmh b/docs/undocumented.bmh
index c6e3fe6..223898e 100644
--- a/docs/undocumented.bmh
+++ b/docs/undocumented.bmh
@@ -698,11 +698,6 @@
     ##
 # end of Topic Math
 
-#Topic Meta_Data
-#Class SkMetaData
-##
-##
-
 #Topic Mip_Map
 #Substitute mip map
 ##
diff --git a/gm/gm.h b/gm/gm.h
index f7e7b56..9d3bc2f 100644
--- a/gm/gm.h
+++ b/gm/gm.h
@@ -13,12 +13,12 @@
 #include "SkCanvas.h"
 #include "SkClipOpPriv.h"
 #include "SkMacros.h"
-#include "SkMetaData.h"
 #include "SkPaint.h"
 #include "SkSize.h"
 #include "SkString.h"
 
 class SkAnimTimer;
+class SkMetaData;
 struct GrContextOptions;
 
 #define DEF_GM(code) \
diff --git a/gn/core.gni b/gn/core.gni
index 50b7086..d5b99fd 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -173,7 +173,6 @@
   "$_src/core/SkMatrixImageFilter.cpp",
   "$_src/core/SkMatrixImageFilter.h",
   "$_src/core/SkMatrixUtils.h",
-  "$_src/core/SkMetaData.cpp",
   "$_src/core/SkMipMap.cpp",
   "$_src/core/SkMipMap.h",
   "$_src/core/SkMiniRecorder.cpp",
@@ -380,7 +379,6 @@
   "$_include/core/SkMath.h",
   "$_include/core/SkMatrix.h",
   "$_include/core/SkMatrix44.h",
-  "$_include/core/SkMetaData.h",
   "$_include/core/SkOverdrawCanvas.h",
   "$_include/core/SkPaint.h",
   "$_include/core/SkPath.h",
diff --git a/gn/utils.gni b/gn/utils.gni
index 5a02653..71a5224 100644
--- a/gn/utils.gni
+++ b/gn/utils.gni
@@ -47,6 +47,7 @@
   "$_src/utils/SkJSONWriter.h",
   "$_src/utils/SkMatrix22.cpp",
   "$_src/utils/SkMatrix22.h",
+  "$_src/utils/SkMetaData.cpp",
   "$_src/utils/SkMultiPictureDocument.cpp",
   "$_src/utils/SkNWayCanvas.cpp",
   "$_src/utils/SkNullCanvas.cpp",
diff --git a/src/core/SkMetaData.cpp b/src/utils/SkMetaData.cpp
similarity index 100%
rename from src/core/SkMetaData.cpp
rename to src/utils/SkMetaData.cpp
diff --git a/include/core/SkMetaData.h b/src/utils/SkMetaData.h
similarity index 100%
rename from include/core/SkMetaData.h
rename to src/utils/SkMetaData.h