[base] Move many files into base
Moved from include/private into include/private/base:
- SkAlignedStorage.h
- SkContainers.h
- SkFloatBits.h
- SkPathEnums.h
- SkTArray.h
- SkTDArray.h
- SkTypeTraits.h
- SkVx.h
- SkCPUTypes.h*
Moved from include/core into include/private/base:
- SkMath.h
- SkSpan.h
We still want SkSpan.h to be a part of the public API,
so include/core/SkSpan.h still exists, it just includes
include/private/base/SkSpan_impl.h
We want to remove SkMath.h from the public API (most
client uses have been removed already), but for now
it too has a shim header file in include/core/SkMath.h
As per the design of base, there are no includes inside
of base on Skia files not also in base. SkLeftShift moved
out of SkTypes.h and into SkMath.h, as that seemed like a better
fit. U8CPU and U16CPU moved into their own file, SkCPUTypes.h
while we decide where their future lies.
Suggested review order:
- include/private/base/BUILD.bazel
- include/private/BUILD.bazel
- include/BUILD.bazel
- gn/*.gni (these are generated from the BUILD.bazel files)
- BUILD.gn
- public.bzl
- Everything else, mostly done with find and replace and
cleaned up with the rewrite_includes.py script.
Change-Id: Icce0d0c445863c6908b63ec31b9595de400988dc
Bug: skia:13983
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/629317
Reviewed-by: Ben Wagner <[email protected]>
Commit-Queue: Kevin Lubick <[email protected]>
Owners-Override: Kevin Lubick <[email protected]>
diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp
index 77bbbe8..a051033 100644
--- a/tests/BlurTest.cpp
+++ b/tests/BlurTest.cpp
@@ -29,8 +29,8 @@
#include "include/effects/SkPerlinNoiseShader.h"
#include "include/gpu/GpuTypes.h"
#include "include/gpu/GrDirectContext.h"
-#include "include/private/SkFloatBits.h"
#include "include/private/SkTPin.h"
+#include "include/private/base/SkFloatBits.h"
#include "src/core/SkBlurMask.h"
#include "src/core/SkGpuBlurUtils.h"
#include "src/core/SkMask.h"
diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp
index 0a4d16e..f3815f6 100644
--- a/tests/CanvasStateTest.cpp
+++ b/tests/CanvasStateTest.cpp
@@ -25,7 +25,7 @@
#include "include/core/SkString.h"
#include "include/core/SkSurface.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "include/utils/SkCanvasStateUtils.h"
#include "src/core/SkTLazy.h"
#include "tests/Test.h"
diff --git a/tests/ClipCubicTest.cpp b/tests/ClipCubicTest.cpp
index 24cc85e..f745dea 100644
--- a/tests/ClipCubicTest.cpp
+++ b/tests/ClipCubicTest.cpp
@@ -16,7 +16,7 @@
#include "include/core/SkScalar.h"
#include "include/core/SkSurface.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkFloatBits.h"
+#include "include/private/base/SkFloatBits.h"
#include "src/core/SkCubicClipper.h"
#include "tests/Test.h"
diff --git a/tests/ColorTest.cpp b/tests/ColorTest.cpp
index ad8eab7..4710ff1 100644
--- a/tests/ColorTest.cpp
+++ b/tests/ColorTest.cpp
@@ -9,6 +9,7 @@
#include "include/core/SkTypes.h"
#include "include/core/SkUnPreMultiply.h"
#include "include/private/SkColorData.h"
+#include "include/private/base/SkCPUTypes.h"
#include "include/utils/SkRandom.h"
#include "src/core/SkMathPriv.h"
#include "tests/Test.h"
diff --git a/tests/CompressedBackendAllocationTest.cpp b/tests/CompressedBackendAllocationTest.cpp
index c839d45..5abd750 100644
--- a/tests/CompressedBackendAllocationTest.cpp
+++ b/tests/CompressedBackendAllocationTest.cpp
@@ -25,7 +25,7 @@
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrTypes.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkAutoPixmapStorage.h"
#include "src/core/SkCompressedDataUtils.h"
diff --git a/tests/CubicMapTest.cpp b/tests/CubicMapTest.cpp
index e8fa0aa..2585ee3 100644
--- a/tests/CubicMapTest.cpp
+++ b/tests/CubicMapTest.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkPoint.h"
#include "include/core/SkScalar.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkVx.h"
+#include "include/private/base/SkVx.h"
#include "src/core/SkGeometry.h"
#include "src/pathops/SkPathOpsCubic.h"
#include "tests/Test.h"
diff --git a/tests/Float16Test.cpp b/tests/Float16Test.cpp
index 1f45923..a3eb1ce 100644
--- a/tests/Float16Test.cpp
+++ b/tests/Float16Test.cpp
@@ -6,7 +6,7 @@
*/
#include "include/private/SkHalf.h"
-#include "include/private/SkVx.h"
+#include "include/private/base/SkVx.h"
#include "include/utils/SkRandom.h"
#include "tests/Test.h"
diff --git a/tests/FloatingPointTextureTest.cpp b/tests/FloatingPointTextureTest.cpp
index d097b6c..f4992be 100644
--- a/tests/FloatingPointTextureTest.cpp
+++ b/tests/FloatingPointTextureTest.cpp
@@ -19,7 +19,7 @@
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrTypes.h"
#include "include/private/SkHalf.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
#include "src/gpu/ganesh/GrImageInfo.h"
diff --git a/tests/FontMgrAndroidParserTest.cpp b/tests/FontMgrAndroidParserTest.cpp
index bcaf861..0c10443 100644
--- a/tests/FontMgrAndroidParserTest.cpp
+++ b/tests/FontMgrAndroidParserTest.cpp
@@ -22,8 +22,8 @@
#include "include/core/SkTypes.h"
#include "include/ports/SkFontMgr_android.h"
#include "include/private/SkFixed.h"
-#include "include/private/SkTArray.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTArray.h"
+#include "include/private/base/SkTDArray.h"
#include "src/core/SkOSFile.h"
#include "src/core/SkTHash.h"
#include "src/ports/SkFontMgr_android_parser.h"
diff --git a/tests/GpuRectanizerTest.cpp b/tests/GpuRectanizerTest.cpp
index 5cc9441..59205ff 100644
--- a/tests/GpuRectanizerTest.cpp
+++ b/tests/GpuRectanizerTest.cpp
@@ -6,7 +6,7 @@
*/
#include "include/core/SkSize.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "include/utils/SkRandom.h"
#include "src/core/SkIPoint16.h"
#include "src/gpu/Rectanizer.h"
diff --git a/tests/GrMemoryPoolTest.cpp b/tests/GrMemoryPoolTest.cpp
index 4c7f35a..1390fb4 100644
--- a/tests/GrMemoryPoolTest.cpp
+++ b/tests/GrMemoryPoolTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "include/private/SkTArray.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTArray.h"
+#include "include/private/base/SkTDArray.h"
#include "include/utils/SkRandom.h"
#include "src/gpu/ganesh/GrMemoryPool.h"
#include "tests/Test.h"
diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp
index 40fbef7..580b15f 100644
--- a/tests/GrMeshTest.cpp
+++ b/tests/GrMeshTest.cpp
@@ -15,10 +15,10 @@
#include "include/core/SkSurfaceProps.h"
#include "include/core/SkTypes.h"
#include "include/gpu/GrDirectContext.h"
-#include "include/private/SkAlignedStorage.h"
#include "include/private/SkColorData.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkAlignedStorage.h"
#include "include/private/base/SkOnce.h"
+#include "include/private/base/SkTArray.h"
#include "include/private/base/SkTo.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkArenaAlloc.h"
diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp
index d6f3882..06e8f40 100644
--- a/tests/GrPipelineDynamicStateTest.cpp
+++ b/tests/GrPipelineDynamicStateTest.cpp
@@ -16,7 +16,7 @@
#include "include/core/SkTypes.h"
#include "include/gpu/GrDirectContext.h"
#include "include/private/SkColorData.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkArenaAlloc.h"
#include "src/core/SkSLTypeShared.h"
diff --git a/tests/GrRenderTaskClusterTest.cpp b/tests/GrRenderTaskClusterTest.cpp
index c20b60c..8750d30 100644
--- a/tests/GrRenderTaskClusterTest.cpp
+++ b/tests/GrRenderTaskClusterTest.cpp
@@ -8,7 +8,7 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkSpan.h"
#include "include/core/SkString.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "src/core/SkTInternalLList.h"
#include "src/gpu/ganesh/GrRenderTask.h"
#include "src/gpu/ganesh/GrRenderTaskCluster.h"
diff --git a/tests/GrSlugTest.cpp b/tests/GrSlugTest.cpp
index 209d58d..12f1aa5 100644
--- a/tests/GrSlugTest.cpp
+++ b/tests/GrSlugTest.cpp
@@ -17,7 +17,7 @@
#include "include/core/SkTypes.h"
#include "include/gpu/GpuTypes.h"
#include "include/gpu/GrDirectContext.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "include/private/chromium/Slug.h"
#include "tests/CtsEnforcement.h"
#include "tests/Test.h"
diff --git a/tests/GrStyledShapeTest.cpp b/tests/GrStyledShapeTest.cpp
index 6f5b4ce..0519051 100644
--- a/tests/GrStyledShapeTest.cpp
+++ b/tests/GrStyledShapeTest.cpp
@@ -25,8 +25,8 @@
#include "include/core/SkTypes.h"
#include "include/effects/SkDashPathEffect.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkTArray.h"
#include "include/private/SkTemplates.h"
+#include "include/private/base/SkTArray.h"
#include "include/private/base/SkTo.h"
#include "src/core/SkPathEffectBase.h"
#include "src/core/SkPathPriv.h"
diff --git a/tests/HSVRoundTripTest.cpp b/tests/HSVRoundTripTest.cpp
index 7668a18..648d166 100644
--- a/tests/HSVRoundTripTest.cpp
+++ b/tests/HSVRoundTripTest.cpp
@@ -8,6 +8,7 @@
#include "include/core/SkColor.h"
#include "include/core/SkScalar.h"
#include "include/core/SkTypes.h"
+#include "include/private/base/SkCPUTypes.h"
#include "tests/Test.h"
DEF_TEST(ColorToHSVRoundTrip, reporter) {
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 8557841..4dfa9df 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -42,7 +42,7 @@
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrRecordingContext.h"
#include "include/gpu/GrTypes.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "include/private/base/SkTo.h"
#include "src/core/SkColorFilterBase.h"
#include "src/core/SkImageFilterTypes.h"
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index 4f0fce6..8ba12a7 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -41,6 +41,7 @@
#include "include/private/SkColorData.h"
#include "include/private/SkFloatingPoint.h"
#include "include/private/SkTemplates.h"
+#include "include/private/base/SkCPUTypes.h"
#include "include/private/base/SkTo.h"
#include "include/private/gpu/ganesh/GrImageContext.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
diff --git a/tests/IncrTopoSortTest.cpp b/tests/IncrTopoSortTest.cpp
index 8de2c4d..4bd343e 100644
--- a/tests/IncrTopoSortTest.cpp
+++ b/tests/IncrTopoSortTest.cpp
@@ -8,8 +8,8 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkTArray.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTArray.h"
+#include "include/private/base/SkTDArray.h"
#include "src/core/SkTSort.h"
#include "tests/Test.h"
diff --git a/tests/InsetConvexPolyTest.cpp b/tests/InsetConvexPolyTest.cpp
index 5684be3..7145466 100644
--- a/tests/InsetConvexPolyTest.cpp
+++ b/tests/InsetConvexPolyTest.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
#include "include/core/SkPoint.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "src/utils/SkPolyUtils.h"
#include "tests/Test.h"
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index 85f1986..33469eb 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "include/core/SkMath.h"
+#include "include/private/base/SkMath.h"
#include "include/core/SkPoint.h"
#include "include/core/SkScalar.h"
#include "include/core/SkTypes.h"
diff --git a/tests/MessageBusTest.cpp b/tests/MessageBusTest.cpp
index 2e912d0..d834110 100644
--- a/tests/MessageBusTest.cpp
+++ b/tests/MessageBusTest.cpp
@@ -8,7 +8,7 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkTypes.h"
#include "include/gpu/GrDirectContext.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "src/core/SkMessageBus.h"
#include "tests/Test.h"
diff --git a/tests/OffsetSimplePolyTest.cpp b/tests/OffsetSimplePolyTest.cpp
index 17c2980..d3156c8 100644
--- a/tests/OffsetSimplePolyTest.cpp
+++ b/tests/OffsetSimplePolyTest.cpp
@@ -6,7 +6,7 @@
*/
#include "include/core/SkPoint.h"
#include "include/core/SkRect.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "src/utils/SkPolyUtils.h"
#include "tests/Test.h"
diff --git a/tests/OpChainTest.cpp b/tests/OpChainTest.cpp
index 02ad7c7..0fa3afc 100644
--- a/tests/OpChainTest.cpp
+++ b/tests/OpChainTest.cpp
@@ -14,7 +14,7 @@
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrTypes.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "include/utils/SkRandom.h"
#include "src/gpu/AtlasTypes.h"
diff --git a/tests/PDFGlyphsToUnicodeTest.cpp b/tests/PDFGlyphsToUnicodeTest.cpp
index 8cecb22..4651a52 100644
--- a/tests/PDFGlyphsToUnicodeTest.cpp
+++ b/tests/PDFGlyphsToUnicodeTest.cpp
@@ -10,8 +10,8 @@
#ifdef SK_SUPPORT_PDF
#include "include/core/SkStream.h"
-#include "include/private/SkTDArray.h"
#include "include/private/SkTemplates.h"
+#include "include/private/base/SkTDArray.h"
#include "include/private/base/SkTo.h"
#include "src/pdf/SkPDFGlyphUse.h"
#include "src/pdf/SkPDFMakeToUnicodeCmap.h"
diff --git a/tests/PDFOpaqueSrcModeToSrcOverTest.cpp b/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
index a1449fe..9348b89 100644
--- a/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
+++ b/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
@@ -15,6 +15,7 @@
#include "include/core/SkStream.h"
#include "include/core/SkTypes.h"
#include "include/docs/SkPDFDocument.h"
+#include "include/private/base/SkCPUTypes.h"
#include "tests/Test.h"
static void run_test(SkWStream* out, SkBlendMode mode, U8CPU alpha) {
diff --git a/tests/PathOpsAngleIdeas.cpp b/tests/PathOpsAngleIdeas.cpp
index 7a3fd6d..43febd4 100644
--- a/tests/PathOpsAngleIdeas.cpp
+++ b/tests/PathOpsAngleIdeas.cpp
@@ -7,7 +7,7 @@
#include "include/core/SkPoint.h"
#include "include/core/SkScalar.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "include/utils/SkRandom.h"
#include "src/core/SkArenaAlloc.h"
#include "src/core/SkTSort.h"
diff --git a/tests/PathOpsAngleTest.cpp b/tests/PathOpsAngleTest.cpp
index 73db54a..789ec5b 100644
--- a/tests/PathOpsAngleTest.cpp
+++ b/tests/PathOpsAngleTest.cpp
@@ -7,8 +7,8 @@
#include "include/core/SkPoint.h"
#include "include/core/SkScalar.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkFloatBits.h"
#include "include/private/SkTemplates.h"
+#include "include/private/base/SkFloatBits.h"
#include "include/utils/SkRandom.h"
#include "src/core/SkArenaAlloc.h"
#include "src/pathops/SkIntersections.h"
diff --git a/tests/PathOpsBattles.cpp b/tests/PathOpsBattles.cpp
index 9231b84..1dd2c2e 100644
--- a/tests/PathOpsBattles.cpp
+++ b/tests/PathOpsBattles.cpp
@@ -6,7 +6,7 @@
*/
#include "include/core/SkPath.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkFloatBits.h"
+#include "include/private/base/SkFloatBits.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/Test.h"
diff --git a/tests/PathOpsBuildUseTest.cpp b/tests/PathOpsBuildUseTest.cpp
index 055ce38..21e4d90 100644
--- a/tests/PathOpsBuildUseTest.cpp
+++ b/tests/PathOpsBuildUseTest.cpp
@@ -6,7 +6,7 @@
*/
#include "include/core/SkPath.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkFloatBits.h"
+#include "include/private/base/SkFloatBits.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/Test.h"
diff --git a/tests/PathOpsBuilderConicTest.cpp b/tests/PathOpsBuilderConicTest.cpp
index 3c3b225..13c15f9 100644
--- a/tests/PathOpsBuilderConicTest.cpp
+++ b/tests/PathOpsBuilderConicTest.cpp
@@ -13,7 +13,7 @@
#include "include/core/SkRegion.h"
#include "include/core/SkScalar.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkFloatBits.h"
+#include "include/private/base/SkFloatBits.h"
#include "include/utils/SkParsePath.h"
#include "include/utils/SkRandom.h"
#include "tests/PathOpsExtendedTest.h"
diff --git a/tests/PathOpsBuilderTest.cpp b/tests/PathOpsBuilderTest.cpp
index 45b2b24..03a5f7b 100644
--- a/tests/PathOpsBuilderTest.cpp
+++ b/tests/PathOpsBuilderTest.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkPathTypes.h"
#include "include/core/SkRect.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkFloatBits.h"
+#include "include/private/base/SkFloatBits.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/Test.h"
diff --git a/tests/PathOpsChalkboardTest.cpp b/tests/PathOpsChalkboardTest.cpp
index 211c303..a594286 100644
--- a/tests/PathOpsChalkboardTest.cpp
+++ b/tests/PathOpsChalkboardTest.cpp
@@ -7,8 +7,8 @@
#include "include/core/SkPath.h"
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkFloatBits.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkFloatBits.h"
+#include "include/private/base/SkTDArray.h"
#include "include/utils/SkRandom.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/PathOpsThreadedCommon.h"
diff --git a/tests/PathOpsDebug.cpp b/tests/PathOpsDebug.cpp
index 4f05604..97e0834 100644
--- a/tests/PathOpsDebug.cpp
+++ b/tests/PathOpsDebug.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkPoint.h"
#include "include/core/SkTypes.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkFloatBits.h"
+#include "include/private/base/SkFloatBits.h"
#include "src/core/SkArenaAlloc.h"
#include "src/pathops/SkIntersections.h"
#include "src/pathops/SkOpAngle.h"
diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp
index 0ccfebb..dc74a64 100644
--- a/tests/PathOpsExtendedTest.cpp
+++ b/tests/PathOpsExtendedTest.cpp
@@ -19,9 +19,9 @@
#include "include/core/SkStream.h"
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkFloatBits.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkFloatBits.h"
#include "include/private/base/SkMutex.h"
+#include "include/private/base/SkTDArray.h"
#include "include/utils/SkParsePath.h"
#include "src/core/SkPathPriv.h"
#include "src/pathops/SkPathOpsDebug.h"
diff --git a/tests/PathOpsFuzz763Test.cpp b/tests/PathOpsFuzz763Test.cpp
index 3527a9b..8c9cdbc 100644
--- a/tests/PathOpsFuzz763Test.cpp
+++ b/tests/PathOpsFuzz763Test.cpp
@@ -6,7 +6,7 @@
*/
#include "include/core/SkPath.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkFloatBits.h"
+#include "include/private/base/SkFloatBits.h"
#include "src/pathops/SkPathOpsTypes.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/Test.h"
diff --git a/tests/PathOpsIssue3651.cpp b/tests/PathOpsIssue3651.cpp
index 32fd292..07482a4 100644
--- a/tests/PathOpsIssue3651.cpp
+++ b/tests/PathOpsIssue3651.cpp
@@ -6,7 +6,7 @@
*/
#include "include/core/SkPath.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkFloatBits.h"
+#include "include/private/base/SkFloatBits.h"
#include "src/pathops/SkPathOpsTypes.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/Test.h"
diff --git a/tests/PathOpsOpCircleThreadedTest.cpp b/tests/PathOpsOpCircleThreadedTest.cpp
index bd7d461..c57cb78 100644
--- a/tests/PathOpsOpCircleThreadedTest.cpp
+++ b/tests/PathOpsOpCircleThreadedTest.cpp
@@ -11,7 +11,7 @@
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "src/pathops/SkPathOpsDebug.h"
#include "tests/PathOpsDebug.h"
#include "tests/PathOpsExtendedTest.h"
diff --git a/tests/PathOpsOpCubicThreadedTest.cpp b/tests/PathOpsOpCubicThreadedTest.cpp
index 05fc974..739b389 100644
--- a/tests/PathOpsOpCubicThreadedTest.cpp
+++ b/tests/PathOpsOpCubicThreadedTest.cpp
@@ -10,7 +10,7 @@
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "src/pathops/SkPathOpsDebug.h"
#include "tests/PathOpsDebug.h"
#include "tests/PathOpsExtendedTest.h"
diff --git a/tests/PathOpsOpLoopThreadedTest.cpp b/tests/PathOpsOpLoopThreadedTest.cpp
index 8233b53..f1849c3 100644
--- a/tests/PathOpsOpLoopThreadedTest.cpp
+++ b/tests/PathOpsOpLoopThreadedTest.cpp
@@ -10,7 +10,7 @@
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "tests/PathOpsDebug.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/PathOpsThreadedCommon.h"
diff --git a/tests/PathOpsOpRectThreadedTest.cpp b/tests/PathOpsOpRectThreadedTest.cpp
index 663719d..52b9ea9 100644
--- a/tests/PathOpsOpRectThreadedTest.cpp
+++ b/tests/PathOpsOpRectThreadedTest.cpp
@@ -10,7 +10,7 @@
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "src/pathops/SkPathOpsDebug.h"
#include "tests/PathOpsDebug.h"
#include "tests/PathOpsExtendedTest.h"
diff --git a/tests/PathOpsOpTest.cpp b/tests/PathOpsOpTest.cpp
index 61aac9a..44dc9ce 100644
--- a/tests/PathOpsOpTest.cpp
+++ b/tests/PathOpsOpTest.cpp
@@ -12,7 +12,7 @@
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkFloatBits.h"
+#include "include/private/base/SkFloatBits.h"
#include "include/utils/SkParsePath.h"
#include "src/core/SkGeometry.h"
#include "src/pathops/SkPathOpsCubic.h"
diff --git a/tests/PathOpsQuadIntersectionTest.cpp b/tests/PathOpsQuadIntersectionTest.cpp
index e0c949e..4b3cd18 100644
--- a/tests/PathOpsQuadIntersectionTest.cpp
+++ b/tests/PathOpsQuadIntersectionTest.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
#include "include/core/SkTypes.h"
-#include "include/private/SkFloatBits.h"
+#include "include/private/base/SkFloatBits.h"
#include "src/pathops/SkIntersections.h"
#include "src/pathops/SkPathOpsDebug.h"
#include "src/pathops/SkPathOpsPoint.h"
diff --git a/tests/PathOpsQuadLineIntersectionThreadedTest.cpp b/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
index af547fa..fa9787a 100644
--- a/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
+++ b/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
@@ -6,8 +6,8 @@
*/
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkTDArray.h"
#include "include/private/SkTemplates.h"
+#include "include/private/base/SkTDArray.h"
#include "src/pathops/SkIntersections.h"
#include "src/pathops/SkPathOpsLine.h"
#include "src/pathops/SkPathOpsPoint.h"
diff --git a/tests/PathOpsSimplifyDegenerateThreadedTest.cpp b/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
index 08f8f31..748c9d7 100644
--- a/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
+++ b/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkScalar.h"
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/PathOpsThreadedCommon.h"
#include "tests/Test.h"
diff --git a/tests/PathOpsSimplifyFailTest.cpp b/tests/PathOpsSimplifyFailTest.cpp
index 409fee2..3af0799 100644
--- a/tests/PathOpsSimplifyFailTest.cpp
+++ b/tests/PathOpsSimplifyFailTest.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkPoint.h"
#include "include/core/SkScalar.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkFloatBits.h"
+#include "include/private/base/SkFloatBits.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/Test.h"
diff --git a/tests/PathOpsSimplifyQuadThreadedTest.cpp b/tests/PathOpsSimplifyQuadThreadedTest.cpp
index 48436b7..a777367 100644
--- a/tests/PathOpsSimplifyQuadThreadedTest.cpp
+++ b/tests/PathOpsSimplifyQuadThreadedTest.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkScalar.h"
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/PathOpsThreadedCommon.h"
#include "tests/Test.h"
diff --git a/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp b/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
index 33beefc..53972a9 100644
--- a/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
+++ b/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkScalar.h"
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/PathOpsThreadedCommon.h"
#include "tests/Test.h"
diff --git a/tests/PathOpsSimplifyRectThreadedTest.cpp b/tests/PathOpsSimplifyRectThreadedTest.cpp
index 0af86a7..b53d138 100644
--- a/tests/PathOpsSimplifyRectThreadedTest.cpp
+++ b/tests/PathOpsSimplifyRectThreadedTest.cpp
@@ -11,7 +11,7 @@
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
#include "include/private/SkMacros.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/PathOpsThreadedCommon.h"
#include "tests/Test.h"
diff --git a/tests/PathOpsSimplifyTest.cpp b/tests/PathOpsSimplifyTest.cpp
index 03abd6c..ed9fa6a 100644
--- a/tests/PathOpsSimplifyTest.cpp
+++ b/tests/PathOpsSimplifyTest.cpp
@@ -10,7 +10,7 @@
#include "include/core/SkRect.h"
#include "include/core/SkScalar.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkFloatBits.h"
+#include "include/private/base/SkFloatBits.h"
#include "src/pathops/SkPathOpsDebug.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/Test.h"
diff --git a/tests/PathOpsSimplifyTrianglesThreadedTest.cpp b/tests/PathOpsSimplifyTrianglesThreadedTest.cpp
index 369139d..c132c43 100644
--- a/tests/PathOpsSimplifyTrianglesThreadedTest.cpp
+++ b/tests/PathOpsSimplifyTrianglesThreadedTest.cpp
@@ -9,7 +9,7 @@
#include "include/core/SkScalar.h"
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/PathOpsThreadedCommon.h"
#include "tests/Test.h"
diff --git a/tests/PathOpsSkpTest.cpp b/tests/PathOpsSkpTest.cpp
index 590f147..c7d94fd 100644
--- a/tests/PathOpsSkpTest.cpp
+++ b/tests/PathOpsSkpTest.cpp
@@ -7,7 +7,7 @@
#include "include/core/SkPath.h"
#include "include/core/SkPathTypes.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkFloatBits.h"
+#include "include/private/base/SkFloatBits.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/Test.h"
diff --git a/tests/PathOpsTestCommon.h b/tests/PathOpsTestCommon.h
index 57988d5..7d18d28 100644
--- a/tests/PathOpsTestCommon.h
+++ b/tests/PathOpsTestCommon.h
@@ -8,7 +8,7 @@
#define PathOpsTestCommon_DEFINED
#include "include/core/SkScalar.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "src/pathops/SkPathOpsPoint.h"
class SkPath;
diff --git a/tests/PathOpsThreadedCommon.h b/tests/PathOpsThreadedCommon.h
index 7bf946a..c9389f8 100644
--- a/tests/PathOpsThreadedCommon.h
+++ b/tests/PathOpsThreadedCommon.h
@@ -10,7 +10,7 @@
#include "include/core/SkBitmap.h"
#include "include/core/SkTypes.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include <string>
diff --git a/tests/PathOpsThreeWayTest.cpp b/tests/PathOpsThreeWayTest.cpp
index 736568f..cd2b563 100644
--- a/tests/PathOpsThreeWayTest.cpp
+++ b/tests/PathOpsThreeWayTest.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
#include "include/core/SkTypes.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "include/private/base/SkMalloc.h"
#include "src/pathops/SkIntersections.h"
#include "src/pathops/SkPathOpsCubic.h"
diff --git a/tests/PathOpsTigerTest.cpp b/tests/PathOpsTigerTest.cpp
index 055c893..2c91b0f 100644
--- a/tests/PathOpsTigerTest.cpp
+++ b/tests/PathOpsTigerTest.cpp
@@ -6,8 +6,8 @@
*/
#include "include/core/SkPath.h"
#include "include/core/SkString.h"
-#include "include/private/SkFloatBits.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkFloatBits.h"
+#include "include/private/base/SkTDArray.h"
#include "include/utils/SkRandom.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/PathOpsThreadedCommon.h"
diff --git a/tests/PathOpsTightBoundsTest.cpp b/tests/PathOpsTightBoundsTest.cpp
index 4ae9dcd..1c830fc 100644
--- a/tests/PathOpsTightBoundsTest.cpp
+++ b/tests/PathOpsTightBoundsTest.cpp
@@ -11,7 +11,7 @@
#include "include/core/SkPath.h"
#include "include/core/SkRect.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "include/utils/SkRandom.h"
#include "tests/PathOpsExtendedTest.h"
#include "tests/PathOpsThreadedCommon.h"
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 5f5f963..8c79356 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -30,11 +30,11 @@
#include "include/core/SkTypes.h"
#include "include/core/SkVertices.h"
#include "include/pathops/SkPathOps.h"
-#include "include/private/SkFloatBits.h"
#include "include/private/SkFloatingPoint.h"
#include "include/private/SkIDChangeListener.h"
-#include "include/private/SkPathEnums.h"
#include "include/private/SkPathRef.h"
+#include "include/private/base/SkFloatBits.h"
+#include "include/private/base/SkPathEnums.h"
#include "include/private/base/SkMalloc.h"
#include "include/private/base/SkTo.h"
#include "include/utils/SkNullCanvas.h"
diff --git a/tests/PolyUtilsTest.cpp b/tests/PolyUtilsTest.cpp
index cce4d91..a4a9f3b 100644
--- a/tests/PolyUtilsTest.cpp
+++ b/tests/PolyUtilsTest.cpp
@@ -6,7 +6,7 @@
*/
#include "include/core/SkPoint.h"
#include "include/core/SkScalar.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "src/utils/SkPolyUtils.h"
#include "tests/Test.h"
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
index e7a7bcd..07579e8 100644
--- a/tests/ProcessorTest.cpp
+++ b/tests/ProcessorTest.cpp
@@ -24,7 +24,7 @@
#include "include/gpu/GrTypes.h"
#include "include/private/SkColorData.h"
#include "include/private/SkSLSampleUsage.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "include/utils/SkRandom.h"
#include "src/gpu/KeyBuilder.h"
diff --git a/tests/PromiseImageTest.cpp b/tests/PromiseImageTest.cpp
index 6973952..d53a884 100644
--- a/tests/PromiseImageTest.cpp
+++ b/tests/PromiseImageTest.cpp
@@ -26,7 +26,7 @@
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrTypes.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrCaps.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
diff --git a/tests/RRectInPathTest.cpp b/tests/RRectInPathTest.cpp
index f02d8b2..76cbf1f 100644
--- a/tests/RRectInPathTest.cpp
+++ b/tests/RRectInPathTest.cpp
@@ -14,8 +14,8 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkScalar.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkFloatBits.h"
#include "include/private/SkPathRef.h"
+#include "include/private/base/SkFloatBits.h"
#include "include/private/base/SkMalloc.h"
#include "src/core/SkPathPriv.h"
#include "tests/Test.h"
diff --git a/tests/RandomTest.cpp b/tests/RandomTest.cpp
index fc0a2fd..272fd01 100644
--- a/tests/RandomTest.cpp
+++ b/tests/RandomTest.cpp
@@ -6,6 +6,7 @@
*/
#include "include/core/SkTypes.h"
+#include "include/private/base/SkMath.h"
#include "include/utils/SkRandom.h"
#include "src/core/SkTSort.h"
#include "tests/Test.h"
diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index b0e3366..afc06f0 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -29,6 +29,7 @@
#include "include/private/SkHalf.h"
#include "include/private/SkSafe32.h"
#include "include/private/base/SkAlign.h"
+#include "include/private/base/SkCPUTypes.h"
#include "src/core/SkImageInfoPriv.h"
#include "src/core/SkMathPriv.h"
#include "tests/Test.h"
diff --git a/tests/ReadWritePixelsGpuTest.cpp b/tests/ReadWritePixelsGpuTest.cpp
index aa6b9cc..ba5b188 100644
--- a/tests/ReadWritePixelsGpuTest.cpp
+++ b/tests/ReadWritePixelsGpuTest.cpp
@@ -32,7 +32,7 @@
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrRecordingContext.h"
#include "include/gpu/GrTypes.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkAutoPixmapStorage.h"
#include "src/core/SkConvertPixels.h"
diff --git a/tests/ResourceAllocatorTest.cpp b/tests/ResourceAllocatorTest.cpp
index 6953424..2283415 100644
--- a/tests/ResourceAllocatorTest.cpp
+++ b/tests/ResourceAllocatorTest.cpp
@@ -18,7 +18,7 @@
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrTypes.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "include/private/base/SkTo.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ResourceKey.h"
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index ad4aff2..ff59b58 100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -24,7 +24,7 @@
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrRecordingContext.h"
#include "include/gpu/GrTypes.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "include/private/base/SkTo.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "include/utils/SkRandom.h"
diff --git a/tests/ScalarTest.cpp b/tests/ScalarTest.cpp
index cd1b493..738038a 100644
--- a/tests/ScalarTest.cpp
+++ b/tests/ScalarTest.cpp
@@ -9,8 +9,8 @@
#include "include/core/SkRect.h"
#include "include/core/SkScalar.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkFloatBits.h"
#include "include/private/SkFloatingPoint.h"
+#include "include/private/base/SkFloatBits.h"
#include "include/private/base/SkTo.h"
#include "tests/Test.h"
diff --git a/tests/SerialProcsTest.cpp b/tests/SerialProcsTest.cpp
index 819f476..c2edef2 100644
--- a/tests/SerialProcsTest.cpp
+++ b/tests/SerialProcsTest.cpp
@@ -21,7 +21,7 @@
#include "include/core/SkTileMode.h"
#include "include/core/SkTypeface.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "tests/Test.h"
#include "tools/Resources.h"
#include "tools/ToolUtils.h"
diff --git a/tests/SkContainersTest.cpp b/tests/SkContainersTest.cpp
index 9f70c9a..05f44b1 100644
--- a/tests/SkContainersTest.cpp
+++ b/tests/SkContainersTest.cpp
@@ -1,7 +1,7 @@
// Copyright 2022 Google LLC.
// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-#include "include/private/SkContainers.h"
+#include "include/private/base/SkContainers.h"
#include "tests/Test.h"
diff --git a/tests/SkRuntimeEffectTest.cpp b/tests/SkRuntimeEffectTest.cpp
index 396f8e7..82f1ba9 100644
--- a/tests/SkRuntimeEffectTest.cpp
+++ b/tests/SkRuntimeEffectTest.cpp
@@ -34,7 +34,7 @@
#include "include/private/SkColorData.h"
#include "include/private/SkSLSampleUsage.h"
#include "include/private/SkSLString.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "include/sksl/SkSLDebugTrace.h"
#include "include/sksl/SkSLVersion.h"
#include "src/core/SkColorSpacePriv.h"
diff --git a/tests/SkSLDSLTest.cpp b/tests/SkSLDSLTest.cpp
index da29eae..ddfe92e5 100644
--- a/tests/SkSLDSLTest.cpp
+++ b/tests/SkSLDSLTest.cpp
@@ -12,7 +12,7 @@
#include "include/private/SkSLProgramElement.h"
#include "include/private/SkSLProgramKind.h"
#include "include/private/SkSLStatement.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "include/sksl/DSL.h"
#include "include/sksl/DSLBlock.h"
#include "include/sksl/DSLCore.h"
diff --git a/tests/SkSLTest.cpp b/tests/SkSLTest.cpp
index 392da13..aafd853 100644
--- a/tests/SkSLTest.cpp
+++ b/tests/SkSLTest.cpp
@@ -23,7 +23,7 @@
#include "include/gpu/GrDirectContext.h"
#include "include/private/SkSLProgramElement.h"
#include "include/private/SkSLProgramKind.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "include/sksl/DSLCore.h"
#include "include/sksl/SkSLVersion.h"
#include "src/core/SkArenaAlloc.h"
diff --git a/tests/SkVxTest.cpp b/tests/SkVxTest.cpp
index 3fa1d18..aafefdd 100644
--- a/tests/SkVxTest.cpp
+++ b/tests/SkVxTest.cpp
@@ -6,7 +6,7 @@
*/
#include "include/core/SkPoint.h"
-#include "include/private/SkVx.h"
+#include "include/private/base/SkVx.h"
#include "include/utils/SkRandom.h"
#include "tests/Test.h"
diff --git a/tests/SrcOverTest.cpp b/tests/SrcOverTest.cpp
index 194507f..ebdbed8 100644
--- a/tests/SrcOverTest.cpp
+++ b/tests/SrcOverTest.cpp
@@ -6,7 +6,7 @@
*/
#include "include/core/SkColorPriv.h"
-#include "include/core/SkMath.h"
+#include "include/private/base/SkMath.h"
#include "tests/Test.h"
#include <algorithm>
diff --git a/tests/StringTest.cpp b/tests/StringTest.cpp
index ee2237e..ccacdf6 100644
--- a/tests/StringTest.cpp
+++ b/tests/StringTest.cpp
@@ -8,7 +8,7 @@
#include "include/core/SkScalar.h"
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "src/core/SkStringUtils.h"
#include "tests/Test.h"
diff --git a/tests/StrokeTest.cpp b/tests/StrokeTest.cpp
index f6bf1e6..737afa6 100644
--- a/tests/StrokeTest.cpp
+++ b/tests/StrokeTest.cpp
@@ -12,7 +12,7 @@
#include "include/core/SkRect.h"
#include "include/core/SkScalar.h"
#include "include/core/SkStrokeRec.h"
-#include "include/private/SkFloatBits.h"
+#include "include/private/base/SkFloatBits.h"
#include "src/core/SkPathPriv.h"
#include "tests/Test.h"
diff --git a/tests/StrokerTest.cpp b/tests/StrokerTest.cpp
index 2591330..35bd095 100644
--- a/tests/StrokerTest.cpp
+++ b/tests/StrokerTest.cpp
@@ -11,7 +11,7 @@
#include "include/core/SkPoint.h"
#include "include/core/SkScalar.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkFloatBits.h"
+#include "include/private/base/SkFloatBits.h"
#include "include/utils/SkRandom.h"
#include "src/core/SkPointPriv.h"
#include "src/core/SkStrokerPriv.h"
diff --git a/tests/SubsetPath.h b/tests/SubsetPath.h
index 2486eb7..c83a677 100644
--- a/tests/SubsetPath.h
+++ b/tests/SubsetPath.h
@@ -8,7 +8,7 @@
#define SubsetPath_DEFINED
#include "include/core/SkPath.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
/* Given a path, generate a the desired minimal subset of the original.
diff --git a/tests/TArrayTest.cpp b/tests/TArrayTest.cpp
index 289866e..9a7f740 100644
--- a/tests/TArrayTest.cpp
+++ b/tests/TArrayTest.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "include/utils/SkRandom.h"
#include "tests/Test.h"
diff --git a/tests/TDPQueueTest.cpp b/tests/TDPQueueTest.cpp
index 086147c..f27d531 100644
--- a/tests/TDPQueueTest.cpp
+++ b/tests/TDPQueueTest.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "include/utils/SkRandom.h"
#include "src/core/SkTDPQueue.h"
#include "tests/Test.h"
diff --git a/tests/Test.h b/tests/Test.h
index 0a6ba7b..e146006 100644
--- a/tests/Test.h
+++ b/tests/Test.h
@@ -10,7 +10,7 @@
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
#include "include/private/SkNoncopyable.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "src/core/SkTraceEvent.h"
#include "tests/CtsEnforcement.h"
#include "tools/Registry.h"
diff --git a/tests/TextBlobCacheTest.cpp b/tests/TextBlobCacheTest.cpp
index 1c17c61..68051ee 100644
--- a/tests/TextBlobCacheTest.cpp
+++ b/tests/TextBlobCacheTest.cpp
@@ -34,8 +34,8 @@
#include "include/gpu/GpuTypes.h"
#include "include/gpu/GrDirectContext.h"
#include "include/private/SkSpinlock.h"
-#include "include/private/SkTArray.h"
#include "include/private/SkTemplates.h"
+#include "include/private/base/SkTArray.h"
#include "include/private/base/SkTo.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
#include "src/gpu/ganesh/text/GrAtlasManager.h"
diff --git a/tests/TextBlobTest.cpp b/tests/TextBlobTest.cpp
index 3d8c21b..f43ad16 100644
--- a/tests/TextBlobTest.cpp
+++ b/tests/TextBlobTest.cpp
@@ -22,8 +22,8 @@
#include "include/core/SkTextBlob.h"
#include "include/core/SkTypeface.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkTArray.h"
#include "include/private/SkTemplates.h"
+#include "include/private/base/SkTArray.h"
#include "include/private/base/SkTo.h"
#include "src/core/SkTextBlobPriv.h"
#include "tests/Test.h"
diff --git a/tests/TextureBindingsResetTest.cpp b/tests/TextureBindingsResetTest.cpp
index f4cbc52..d17fa1a 100644
--- a/tests/TextureBindingsResetTest.cpp
+++ b/tests/TextureBindingsResetTest.cpp
@@ -27,7 +27,7 @@
#include "include/gpu/gl/GrGLFunctions.h"
#include "include/gpu/gl/GrGLInterface.h"
#include "include/gpu/gl/GrGLTypes.h"
-#include "include/private/SkTDArray.h"
+#include "include/private/base/SkTDArray.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrCaps.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
diff --git a/tests/TopoSortTest.cpp b/tests/TopoSortTest.cpp
index 0fbaea1..496c678 100644
--- a/tests/TopoSortTest.cpp
+++ b/tests/TopoSortTest.cpp
@@ -8,7 +8,7 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkTArray.h"
+#include "include/private/base/SkTArray.h"
#include "include/utils/SkRandom.h"
#include "src/gpu/ganesh/GrTTopoSort.h"
#include "tests/Test.h"
diff --git a/tests/TriangulatingPathRendererTests.cpp b/tests/TriangulatingPathRendererTests.cpp
index d8b9110..410ec6f 100644
--- a/tests/TriangulatingPathRendererTests.cpp
+++ b/tests/TriangulatingPathRendererTests.cpp
@@ -24,8 +24,8 @@
#include "include/effects/SkGradientShader.h"
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrTypes.h"
-#include "include/private/SkFloatBits.h"
#include "include/private/SkTemplates.h"
+#include "include/private/base/SkFloatBits.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "include/utils/SkRandom.h"
#include "src/core/SkArenaAlloc.h"
diff --git a/tests/WangsFormulaTest.cpp b/tests/WangsFormulaTest.cpp
index bcf52d5..2d8b3f4 100644
--- a/tests/WangsFormulaTest.cpp
+++ b/tests/WangsFormulaTest.cpp
@@ -10,7 +10,7 @@
#include "include/core/SkRect.h"
#include "include/core/SkScalar.h"
#include "include/core/SkTypes.h"
-#include "include/private/SkVx.h"
+#include "include/private/base/SkVx.h"
#include "include/utils/SkRandom.h"
#include "src/core/SkGeometry.h"
#include "src/gpu/tessellate/Tessellation.h"
diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp
index 2b9ecb6..8bc0902 100644
--- a/tests/WritePixelsTest.cpp
+++ b/tests/WritePixelsTest.cpp
@@ -29,6 +29,7 @@
#include "include/private/SkColorData.h"
#include "include/private/SkSafe32.h"
#include "include/private/base/SkMalloc.h"
+#include "include/private/base/SkCPUTypes.h"
#include "include/private/base/SkTo.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkImageInfoPriv.h"
