diff --git a/gn/core.gni b/gn/core.gni
index c87315afcb..16fe9c936e 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -503,7 +503,6 @@ skia_core_sources = [
   "$_include/private/SkTFitsIn.h",
   "$_include/private/SkTHash.h",
   "$_include/private/SkTLogic.h",
-  "$_include/private/SkTOptional.h",
   "$_include/private/SkTemplates.h",
   "$_include/private/SkThreadAnnotations.h",
   "$_include/private/SkThreadID.h",
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index f6001614d5..b16d27aee4 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -28,10 +28,10 @@
 #include "include/core/SkTypes.h"
 #include "include/private/SkDeque.h"
 #include "include/private/SkMacros.h"
-#include "include/private/SkTOptional.h"
 
 #include <cstring>
 #include <memory>
+#include <optional>
 #include <vector>
 
 #ifndef SK_SUPPORT_LEGACY_GETTOTALMATRIX
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index 72dfefa345..682474a1a3 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -15,11 +15,11 @@
 #include "include/core/SkScalar.h"
 #include "include/core/SkShader.h"
 #include "include/core/SkTileMode.h"
-#include "include/private/SkTOptional.h"
 #if SK_SUPPORT_GPU
 #include "include/gpu/GrTypes.h"
 #endif
 #include <functional>  // std::function
+#include <optional>
 
 #if defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26
 #include <android/hardware_buffer.h>
diff --git a/include/core/SkImageGenerator.h b/include/core/SkImageGenerator.h
index bdd913c61f..970ccdbab9 100644
--- a/include/core/SkImageGenerator.h
+++ b/include/core/SkImageGenerator.h
@@ -13,7 +13,8 @@
 #include "include/core/SkImage.h"
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkYUVAPixmaps.h"
-#include "include/private/SkTOptional.h"
+
+#include <optional>
 
 class GrRecordingContext;
 class GrSurfaceProxyView;
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 08c4aa9e41..c4500bf12c 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -11,9 +11,10 @@
 #include "include/core/SkBlendMode.h"
 #include "include/core/SkColor.h"
 #include "include/core/SkRefCnt.h"
-#include "include/private/SkTOptional.h"
 #include "include/private/SkTo.h"
 
+#include <optional>
+
 class SkBlender;
 class SkColorFilter;
 class SkColorSpace;
diff --git a/include/effects/SkRuntimeEffect.h b/include/effects/SkRuntimeEffect.h
index cdda2b5561..2591c362aa 100644
--- a/include/effects/SkRuntimeEffect.h
+++ b/include/effects/SkRuntimeEffect.h
@@ -18,9 +18,9 @@
 #include "include/core/SkString.h"
 #include "include/private/SkOnce.h"
 #include "include/private/SkSLSampleUsage.h"
-#include "include/private/SkTOptional.h"
 
 #include <string>
+#include <optional>
 #include <vector>
 
 #ifdef SK_ENABLE_SKSL
diff --git a/include/private/SkTOptional.h b/include/private/SkTOptional.h
deleted file mode 100644
index 137b3cb267..0000000000
--- a/include/private/SkTOptional.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2021 Google LLC.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkTOptional_DEFINED
-#define SkTOptional_DEFINED
-
-#include <optional>
-
-namespace skstd {
-
-template <typename T> using optional = std::optional<T>;
-using nullopt_t = std::nullopt_t;
-inline constexpr nullopt_t nullopt = std::nullopt;
-
-} // namespace skstd
-
-#endif