diff --git a/fuzz/FuzzSkParagraph.cpp b/fuzz/FuzzSkParagraph.cpp
index 0c66225..f4765f9 100644
--- a/fuzz/FuzzSkParagraph.cpp
+++ b/fuzz/FuzzSkParagraph.cpp
@@ -19,6 +19,7 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkStream.h"
 #include "include/core/SkString.h"
 #include "include/core/SkTypeface.h"
@@ -37,7 +38,6 @@
 #include "modules/skparagraph/src/TextLine.h"
 #include "modules/skparagraph/utils/TestFontCollection.h"
 #include "src/core/SkOSFile.h"
-#include "src/core/SkSpan.h"
 #include "src/utils/SkOSPath.h"
 #include "src/utils/SkShaperJSONWriter.h"
 #include "tests/Test.h"
diff --git a/gm/drawglyphs.cpp b/gm/drawglyphs.cpp
index 72b334b..92dfb26 100644
--- a/gm/drawglyphs.cpp
+++ b/gm/drawglyphs.cpp
@@ -10,8 +10,8 @@
 #include "include/core/SkFont.h"
 #include "include/core/SkPaint.h"
 #include "include/core/SkRSXform.h"
+#include "include/core/SkSpan.h"
 #include "include/private/SkTDArray.h"
-#include "src/core/SkSpan.h"
 #include "src/core/SkZip.h"
 #include "tools/ToolUtils.h"
 
diff --git a/src/core/SkSpan.h b/include/core/SkSpan.h
similarity index 92%
rename from src/core/SkSpan.h
rename to include/core/SkSpan.h
index 667959b..5e1ad5b 100644
--- a/src/core/SkSpan.h
+++ b/include/core/SkSpan.h
@@ -15,6 +15,10 @@
 #include "include/private/SkTLogic.h"
 
 /**
+ * An SkSpan is a view of a contiguous collection of elements of type T. It can be directly
+ * constructed from a pointer and size. SkMakeSpan can be used to construct one from an array,
+ * or a container (like std::vector).
+ *
  * With C++17, we could add template deduction guides that eliminate the need for SkMakeSpan:
  *     https://skia-review.googlesource.com/c/skia/+/320264
  */
diff --git a/modules/skparagraph/src/Iterators.h b/modules/skparagraph/src/Iterators.h
index f418b3b..e74911d 100644
--- a/modules/skparagraph/src/Iterators.h
+++ b/modules/skparagraph/src/Iterators.h
@@ -2,11 +2,11 @@
 #ifndef FontIterator_DEFINED
 #define FontIterator_DEFINED
 
+#include "include/core/SkSpan.h"
 #include "include/core/SkString.h"
 #include "include/core/SkTypes.h"
 #include "modules/skparagraph/include/TextStyle.h"
 #include "modules/skshaper/include/SkShaper.h"
-#include "src/core/SkSpan.h"
 
 namespace skia {
 namespace textlayout {
diff --git a/modules/skparagraph/src/OneLineShaper.h b/modules/skparagraph/src/OneLineShaper.h
index 53bb312..929e4ad 100644
--- a/modules/skparagraph/src/OneLineShaper.h
+++ b/modules/skparagraph/src/OneLineShaper.h
@@ -4,10 +4,10 @@
 
 #include <functional>  // std::function
 #include <queue>
+#include "include/core/SkSpan.h"
 #include "modules/skparagraph/include/TextStyle.h"
 #include "modules/skparagraph/src/ParagraphImpl.h"
 #include "modules/skparagraph/src/Run.h"
-#include "src/core/SkSpan.h"
 
 namespace skia {
 namespace textlayout {
diff --git a/modules/skparagraph/src/ParagraphImpl.cpp b/modules/skparagraph/src/ParagraphImpl.cpp
index 0b75ef2..4c8fe03 100644
--- a/modules/skparagraph/src/ParagraphImpl.cpp
+++ b/modules/skparagraph/src/ParagraphImpl.cpp
@@ -4,6 +4,7 @@
 #include "include/core/SkFontMetrics.h"
 #include "include/core/SkMatrix.h"
 #include "include/core/SkPictureRecorder.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkTypeface.h"
 #include "include/private/SkTFitsIn.h"
 #include "include/private/SkTo.h"
@@ -16,7 +17,6 @@
 #include "modules/skparagraph/src/Run.h"
 #include "modules/skparagraph/src/TextLine.h"
 #include "modules/skparagraph/src/TextWrapper.h"
-#include "src/core/SkSpan.h"
 #include "src/utils/SkUTF.h"
 #include <math.h>
 #include <algorithm>
diff --git a/modules/skparagraph/src/ParagraphImpl.h b/modules/skparagraph/src/ParagraphImpl.h
index c3f643d..47eb4dc 100644
--- a/modules/skparagraph/src/ParagraphImpl.h
+++ b/modules/skparagraph/src/ParagraphImpl.h
@@ -9,6 +9,7 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkString.h"
 #include "include/core/SkTypes.h"
 #include "include/private/SkBitmaskEnum.h"
@@ -25,7 +26,6 @@
 #include "modules/skparagraph/src/Run.h"
 #include "modules/skparagraph/src/TextLine.h"
 #include "modules/skshaper/src/SkUnicode.h"
-#include "src/core/SkSpan.h"
 
 #include <memory>
 #include <string>
diff --git a/modules/skparagraph/src/Run.h b/modules/skparagraph/src/Run.h
index 8a5e41f..193de70 100644
--- a/modules/skparagraph/src/Run.h
+++ b/modules/skparagraph/src/Run.h
@@ -7,12 +7,12 @@
 #include "include/core/SkPoint.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkScalar.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkTypes.h"
 #include "include/private/SkTArray.h"
 #include "modules/skparagraph/include/DartTypes.h"
 #include "modules/skparagraph/include/TextStyle.h"
 #include "modules/skshaper/include/SkShaper.h"
-#include "src/core/SkSpan.h"
 
 #include <math.h>
 #include <algorithm>
diff --git a/modules/skparagraph/src/TextLine.cpp b/modules/skparagraph/src/TextLine.cpp
index fad9d8f..1c4d24e 100644
--- a/modules/skparagraph/src/TextLine.cpp
+++ b/modules/skparagraph/src/TextLine.cpp
@@ -5,6 +5,7 @@
 #include "include/core/SkFontMetrics.h"
 #include "include/core/SkMaskFilter.h"
 #include "include/core/SkPaint.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkString.h"
 #include "include/core/SkTextBlob.h"
 #include "include/core/SkTypes.h"
@@ -19,7 +20,6 @@
 #include "modules/skparagraph/src/ParagraphImpl.h"
 #include "modules/skparagraph/src/TextLine.h"
 #include "modules/skshaper/include/SkShaper.h"
-#include "src/core/SkSpan.h"
 
 #include <algorithm>
 #include <iterator>
diff --git a/modules/skparagraph/src/TextWrapper.h b/modules/skparagraph/src/TextWrapper.h
index fccf21f..e5efa78 100644
--- a/modules/skparagraph/src/TextWrapper.h
+++ b/modules/skparagraph/src/TextWrapper.h
@@ -3,8 +3,8 @@
 #define TextWrapper_DEFINED
 
 #include <string>
+#include "include/core/SkSpan.h"
 #include "modules/skparagraph/src/TextLine.h"
-#include "src/core/SkSpan.h"
 
 namespace skia {
 namespace textlayout {
diff --git a/modules/skparagraph/tests/SkParagraphTest.cpp b/modules/skparagraph/tests/SkParagraphTest.cpp
index 4fc51f7..a9253b3 100644
--- a/modules/skparagraph/tests/SkParagraphTest.cpp
+++ b/modules/skparagraph/tests/SkParagraphTest.cpp
@@ -11,6 +11,7 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkStream.h"
 #include "include/core/SkString.h"
 #include "include/core/SkTypeface.h"
@@ -29,7 +30,6 @@
 #include "modules/skparagraph/src/TextLine.h"
 #include "modules/skparagraph/utils/TestFontCollection.h"
 #include "src/core/SkOSFile.h"
-#include "src/core/SkSpan.h"
 #include "src/utils/SkOSPath.h"
 #include "src/utils/SkShaperJSONWriter.h"
 #include "tests/Test.h"
diff --git a/modules/skshaper/src/SkShaper_harfbuzz.cpp b/modules/skshaper/src/SkShaper_harfbuzz.cpp
index edd7c2d..1cd6754 100644
--- a/modules/skshaper/src/SkShaper_harfbuzz.cpp
+++ b/modules/skshaper/src/SkShaper_harfbuzz.cpp
@@ -15,6 +15,7 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkStream.h"
 #include "include/core/SkTypeface.h"
 #include "include/core/SkTypes.h"
@@ -28,7 +29,6 @@
 #include "modules/skshaper/include/SkShaper.h"
 #include "modules/skshaper/src/SkUnicode.h"
 #include "src/core/SkLRUCache.h"
-#include "src/core/SkSpan.h"
 #include "src/core/SkTDPQueue.h"
 #include "src/utils/SkUTF.h"
 
diff --git a/modules/skshaper/src/SkUnicode.h b/modules/skshaper/src/SkUnicode.h
index 5a718e3..87134b2 100644
--- a/modules/skshaper/src/SkUnicode.h
+++ b/modules/skshaper/src/SkUnicode.h
@@ -7,8 +7,8 @@
 #ifndef SkUnicode_DEFINED
 #define SkUnicode_DEFINED
 
+#include "include/core/SkSpan.h"
 #include "include/core/SkTypes.h"
-#include "src/core/SkSpan.h"
 #include "src/utils/SkUTF.h"
 #include <vector>
 
diff --git a/src/core/SkGlyphRun.h b/src/core/SkGlyphRun.h
index 0608ce4..94b4163 100644
--- a/src/core/SkGlyphRun.h
+++ b/src/core/SkGlyphRun.h
@@ -15,9 +15,9 @@
 #include "include/core/SkPaint.h"
 #include "include/core/SkPoint.h"
 #include "include/core/SkRSXform.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkTypes.h"
 #include "include/private/SkTemplates.h"
-#include "src/core/SkSpan.h"
 #include "src/core/SkZip.h"
 
 class SkBaseDevice;
diff --git a/src/core/SkRemoteGlyphCache.cpp b/src/core/SkRemoteGlyphCache.cpp
index 0c268ad..9c2e7bb 100644
--- a/src/core/SkRemoteGlyphCache.cpp
+++ b/src/core/SkRemoteGlyphCache.cpp
@@ -15,6 +15,7 @@
 #include <tuple>
 
 #include "include/core/SkSerialProcs.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkTypeface.h"
 #include "include/private/SkChecksum.h"
 #include "include/private/SkTHash.h"
@@ -23,7 +24,6 @@
 #include "src/core/SkEnumerate.h"
 #include "src/core/SkGlyphRun.h"
 #include "src/core/SkScalerCache.h"
-#include "src/core/SkSpan.h"
 #include "src/core/SkStrikeCache.h"
 #include "src/core/SkStrikeForGPU.h"
 #include "src/core/SkTLazy.h"
diff --git a/src/core/SkStrikeForGPU.h b/src/core/SkStrikeForGPU.h
index 9c7b4a5..5c5ada0 100644
--- a/src/core/SkStrikeForGPU.h
+++ b/src/core/SkStrikeForGPU.h
@@ -10,9 +10,9 @@
 
 #include "include/core/SkPaint.h"
 #include "include/core/SkPoint.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkTypes.h"
 #include "src/core/SkGlyph.h"
-#include "src/core/SkSpan.h"
 
 #include <memory>
 
diff --git a/src/core/SkVM.h b/src/core/SkVM.h
index 7a99d30..3efead2 100644
--- a/src/core/SkVM.h
+++ b/src/core/SkVM.h
@@ -10,10 +10,10 @@
 
 #include "include/core/SkBlendMode.h"
 #include "include/core/SkColor.h"
+#include "include/core/SkSpan.h"
 #include "include/private/SkMacros.h"
 #include "include/private/SkTArray.h"
 #include "include/private/SkTHash.h"
-#include "src/core/SkSpan.h"
 #include "src/core/SkVM_fwd.h"
 #include <vector>      // std::vector
 
diff --git a/src/core/SkZip.h b/src/core/SkZip.h
index 5cf6120..45e1a13 100644
--- a/src/core/SkZip.h
+++ b/src/core/SkZip.h
@@ -13,10 +13,10 @@
 #include <type_traits>
 #include <utility>
 
+#include "include/core/SkSpan.h"
 #include "include/core/SkTypes.h"
 #include "include/private/SkTemplates.h"
 #include "include/private/SkTo.h"
-#include "src/core/SkSpan.h"
 
 // Take a list of things that can be pointers, and use them all in parallel. The iterators and
 // accessor operator[] for the class produce a tuple of the items.
diff --git a/src/gpu/GrDirectContextPriv.h b/src/gpu/GrDirectContextPriv.h
index a6a8c02..caa4d7a 100644
--- a/src/gpu/GrDirectContextPriv.h
+++ b/src/gpu/GrDirectContextPriv.h
@@ -8,9 +8,9 @@
 #ifndef GrDirectContextPriv_DEFINED
 #define GrDirectContextPriv_DEFINED
 
+#include "include/core/SkSpan.h"
 #include "include/core/SkSurface.h"
 #include "include/gpu/GrDirectContext.h"
-#include "src/core/SkSpan.h"
 
 class GrAtlasManager;
 class GrBackendFormat;
diff --git a/src/gpu/GrDrawingManager.h b/src/gpu/GrDrawingManager.h
index b9a09dc..7ce9aa7 100644
--- a/src/gpu/GrDrawingManager.h
+++ b/src/gpu/GrDrawingManager.h
@@ -8,10 +8,10 @@
 #ifndef GrDrawingManager_DEFINED
 #define GrDrawingManager_DEFINED
 
+#include "include/core/SkSpan.h"
 #include "include/core/SkSurface.h"
 #include "include/private/SkTArray.h"
 #include "include/private/SkTHash.h"
-#include "src/core/SkSpan.h"
 #include "src/gpu/GrBufferAllocPool.h"
 #include "src/gpu/GrDeferredUpload.h"
 #include "src/gpu/GrHashMapWithCache.h"
diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h
index b6932e8..7a83519 100644
--- a/src/gpu/GrGpu.h
+++ b/src/gpu/GrGpu.h
@@ -9,10 +9,10 @@
 #define GrGpu_DEFINED
 
 #include "include/core/SkPath.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkSurface.h"
 #include "include/gpu/GrTypes.h"
 #include "include/private/SkTArray.h"
-#include "src/core/SkSpan.h"
 #include "src/core/SkTInternalLList.h"
 #include "src/gpu/GrAttachment.h"
 #include "src/gpu/GrCaps.h"
diff --git a/src/gpu/GrOnFlushResourceProvider.h b/src/gpu/GrOnFlushResourceProvider.h
index 2b693e2..09ebd3c 100644
--- a/src/gpu/GrOnFlushResourceProvider.h
+++ b/src/gpu/GrOnFlushResourceProvider.h
@@ -9,8 +9,8 @@
 #define GrOnFlushResourceProvider_DEFINED
 
 #include "include/core/SkRefCnt.h"
+#include "include/core/SkSpan.h"
 #include "include/private/SkTArray.h"
-#include "src/core/SkSpan.h"
 #include "src/gpu/GrDeferredUpload.h"
 #include "src/gpu/GrOpFlushState.h"
 #include "src/gpu/GrResourceProvider.h"
diff --git a/src/gpu/GrOpsTask.h b/src/gpu/GrOpsTask.h
index b7b9bda..89b1576 100644
--- a/src/gpu/GrOpsTask.h
+++ b/src/gpu/GrOpsTask.h
@@ -10,6 +10,7 @@
 
 #include "include/core/SkMatrix.h"
 #include "include/core/SkRefCnt.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkStrokeRec.h"
 #include "include/core/SkTypes.h"
 #include "include/gpu/GrRecordingContext.h"
@@ -17,7 +18,6 @@
 #include "include/private/SkTDArray.h"
 #include "src/core/SkArenaAlloc.h"
 #include "src/core/SkClipStack.h"
-#include "src/core/SkSpan.h"
 #include "src/core/SkStringUtils.h"
 #include "src/core/SkTLazy.h"
 #include "src/gpu/GrAppliedClip.h"
diff --git a/src/gpu/GrRenderTaskCluster.h b/src/gpu/GrRenderTaskCluster.h
index fa125a1..81ebf8c 100644
--- a/src/gpu/GrRenderTaskCluster.h
+++ b/src/gpu/GrRenderTaskCluster.h
@@ -9,7 +9,7 @@
 #define GrRenderTaskCluster_DEFINED
 
 #include "include/core/SkRefCnt.h"
-#include "src/core/SkSpan.h"
+#include "include/core/SkSpan.h"
 #include "src/core/SkTInternalLList.h"
 
 class GrRenderTask;
diff --git a/src/gpu/GrSubRunAllocator.h b/src/gpu/GrSubRunAllocator.h
index e30fa5c..321f412 100644
--- a/src/gpu/GrSubRunAllocator.h
+++ b/src/gpu/GrSubRunAllocator.h
@@ -8,8 +8,8 @@
 #ifndef GrSubRunAllocator_DEFINED
 #define GrSubRunAllocator_DEFINED
 
+#include "include/core/SkSpan.h"
 #include "src/core/SkArenaAlloc.h"
-#include "src/core/SkSpan.h"
 
 #include <algorithm>
 #include <memory>
diff --git a/src/gpu/glsl/GrGLSLShaderBuilder.h b/src/gpu/glsl/GrGLSLShaderBuilder.h
index cd328bc..a047240 100644
--- a/src/gpu/glsl/GrGLSLShaderBuilder.h
+++ b/src/gpu/glsl/GrGLSLShaderBuilder.h
@@ -8,10 +8,10 @@
 #ifndef GrGLSLShaderBuilder_DEFINED
 #define GrGLSLShaderBuilder_DEFINED
 
+#include "include/core/SkSpan.h"
 #include "include/private/SkSLStatement.h"
 #include "include/private/SkSLString.h"
 #include "include/private/SkTDArray.h"
-#include "src/core/SkSpan.h"
 #include "src/gpu/GrShaderVar.h"
 #include "src/gpu/GrTBlockList.h"
 #include "src/gpu/glsl/GrGLSLUniformHandler.h"
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index bc6f843..9f9ed83 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -8,11 +8,11 @@
 #include "src/gpu/ops/GrAtlasTextOp.h"
 
 #include "include/core/SkPoint3.h"
+#include "include/core/SkSpan.h"
 #include "include/gpu/GrRecordingContext.h"
 #include "src/core/SkMathPriv.h"
 #include "src/core/SkMatrixPriv.h"
 #include "src/core/SkMatrixProvider.h"
-#include "src/core/SkSpan.h"
 #include "src/core/SkStrikeCache.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrMemoryPool.h"
diff --git a/src/sksl/SkSLDehydrator.h b/src/sksl/SkSLDehydrator.h
index 247a7ee..b8a5e24 100644
--- a/src/sksl/SkSLDehydrator.h
+++ b/src/sksl/SkSLDehydrator.h
@@ -10,10 +10,10 @@
 
 #ifdef SKSL_STANDALONE
 
+#include "include/core/SkSpan.h"
 #include "include/private/SkSLModifiers.h"
 #include "include/private/SkSLSymbol.h"
 #include "include/private/SkTHash.h"
-#include "src/core/SkSpan.h"
 #include "src/sksl/SkSLOutputStream.h"
 #include "src/sksl/SkSLStringStream.h"
 
diff --git a/src/sksl/codegen/SkSLVMCodeGenerator.h b/src/sksl/codegen/SkSLVMCodeGenerator.h
index 2ef8f9b..fa0ce16 100644
--- a/src/sksl/codegen/SkSLVMCodeGenerator.h
+++ b/src/sksl/codegen/SkSLVMCodeGenerator.h
@@ -8,8 +8,8 @@
 #ifndef SKSL_VMGENERATOR
 #define SKSL_VMGENERATOR
 
+#include "include/core/SkSpan.h"
 #include "include/private/SkSLString.h"
-#include "src/core/SkSpan.h"
 #include "src/core/SkVM.h"
 #include "src/sksl/ir/SkSLType.h"
 
diff --git a/src/sksl/ir/SkSLConstructor.h b/src/sksl/ir/SkSLConstructor.h
index 0a39db6..e6afade 100644
--- a/src/sksl/ir/SkSLConstructor.h
+++ b/src/sksl/ir/SkSLConstructor.h
@@ -8,7 +8,7 @@
 #ifndef SKSL_CONSTRUCTOR
 #define SKSL_CONSTRUCTOR
 
-#include "src/core/SkSpan.h"
+#include "include/core/SkSpan.h"
 #include "src/sksl/SkSLIRGenerator.h"
 #include "src/sksl/ir/SkSLExpression.h"
 
diff --git a/src/utils/SkShaperJSONWriter.h b/src/utils/SkShaperJSONWriter.h
index bca0cd1..2b94094 100644
--- a/src/utils/SkShaperJSONWriter.h
+++ b/src/utils/SkShaperJSONWriter.h
@@ -14,8 +14,8 @@
 #include <string>
 #include <vector>
 
+#include "include/core/SkSpan.h"
 #include "modules/skshaper/include/SkShaper.h"
-#include "src/core/SkSpan.h"
 
 class SkJSONWriter;
 
diff --git a/tests/ResourceAllocatorTest.cpp b/tests/ResourceAllocatorTest.cpp
index 89649d1..8b4aae2 100644
--- a/tests/ResourceAllocatorTest.cpp
+++ b/tests/ResourceAllocatorTest.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "include/core/SkCanvas.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkSurface.h"
 #include "include/gpu/GrDirectContext.h"
-#include "src/core/SkSpan.h"
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/GrGpu.h"
 #include "src/gpu/GrProxyProvider.h"
diff --git a/tests/SkShaperJSONWriterTest.cpp b/tests/SkShaperJSONWriterTest.cpp
index 7a489e8..c7d4ec3 100644
--- a/tests/SkShaperJSONWriterTest.cpp
+++ b/tests/SkShaperJSONWriterTest.cpp
@@ -9,7 +9,7 @@
 
 #include "tests/Test.h"
 
-#include "src/core/SkSpan.h"
+#include "include/core/SkSpan.h"
 #include "src/utils/SkJSONWriter.h"
 #include "src/utils/SkUTF.h"
 
diff --git a/tests/UtilsTest.cpp b/tests/UtilsTest.cpp
index bd3b0a2..ae0d61c 100644
--- a/tests/UtilsTest.cpp
+++ b/tests/UtilsTest.cpp
@@ -6,9 +6,9 @@
  */
 
 #include "include/core/SkRefCnt.h"
+#include "include/core/SkSpan.h"
 #include "include/utils/SkRandom.h"
 #include "src/core/SkEnumerate.h"
-#include "src/core/SkSpan.h"
 #include "src/core/SkTSearch.h"
 #include "src/core/SkTSort.h"
 #include "src/core/SkZip.h"
diff --git a/tools/DDLTileHelper.h b/tools/DDLTileHelper.h
index 3df3150..b147ad8 100644
--- a/tools/DDLTileHelper.h
+++ b/tools/DDLTileHelper.h
@@ -11,8 +11,8 @@
 #include "include/core/SkDeferredDisplayList.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkSurfaceCharacterization.h"
-#include "src/core/SkSpan.h"
 
 class DDLPromiseImageHelper;
 class PromiseImageCallbackContext;
diff --git a/tools/fonts/TestSVGTypeface.h b/tools/fonts/TestSVGTypeface.h
index 201de93..487d173 100644
--- a/tools/fonts/TestSVGTypeface.h
+++ b/tools/fonts/TestSVGTypeface.h
@@ -15,6 +15,7 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkScalar.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkStream.h"
 #include "include/core/SkString.h"
 #include "include/core/SkTypeface.h"
@@ -23,7 +24,6 @@
 #include "include/private/SkMutex.h"
 #include "include/private/SkTArray.h"
 #include "include/private/SkTHash.h"
-#include "src/core/SkSpan.h"
 
 #include <memory>
 
diff --git a/tools/fonts/create_test_font.cpp b/tools/fonts/create_test_font.cpp
index c4f2ddb..a187aed 100644
--- a/tools/fonts/create_test_font.cpp
+++ b/tools/fonts/create_test_font.cpp
@@ -13,12 +13,12 @@
 #include "include/core/SkFontMetrics.h"
 #include "include/core/SkFontStyle.h"
 #include "include/core/SkPath.h"
+#include "include/core/SkSpan.h"
 #include "include/core/SkStream.h"
 #include "include/core/SkTypeface.h"
 #include "include/private/SkTArray.h"
 #include "src/core/SkOSFile.h"
 #include "src/core/SkPathPriv.h"
-#include "src/core/SkSpan.h"
 #include "src/utils/SkOSPath.h"
 #include "src/utils/SkUTF.h"