diff --git a/include/swift/ABI/Executor.h b/include/swift/ABI/Executor.h
index cfb94f04d6885..f3f428b87e1ea 100644
--- a/include/swift/ABI/Executor.h
+++ b/include/swift/ABI/Executor.h
@@ -28,6 +28,7 @@ class AsyncTask;
 class DefaultActor;
 class Job;
 class SerialExecutorWitnessTable;
+struct SwiftError;
 class TaskExecutorWitnessTable;
 
 /// An unmanaged reference to a serial executor.
diff --git a/include/swift/ABI/Task.h b/include/swift/ABI/Task.h
index 66f0621c8bc6f..d624dc0ba3004 100644
--- a/include/swift/ABI/Task.h
+++ b/include/swift/ABI/Task.h
@@ -17,7 +17,6 @@
 #ifndef SWIFT_ABI_TASK_H
 #define SWIFT_ABI_TASK_H
 
-#include "swift/ABI/TaskLocal.h"
 #include "swift/ABI/Executor.h"
 #include "swift/ABI/HeapObject.h"
 #include "swift/ABI/Metadata.h"
diff --git a/include/swift/ABI/TaskOptions.h b/include/swift/ABI/TaskOptions.h
index 39775009bef4d..b43efda4b43d3 100644
--- a/include/swift/ABI/TaskOptions.h
+++ b/include/swift/ABI/TaskOptions.h
@@ -17,7 +17,6 @@
 #ifndef SWIFT_ABI_TASK_OPTIONS_H
 #define SWIFT_ABI_TASK_OPTIONS_H
 
-#include "swift/ABI/TaskLocal.h"
 #include "swift/ABI/Executor.h"
 #include "swift/ABI/HeapObject.h"
 #include "swift/ABI/Metadata.h"
diff --git a/stdlib/public/Concurrency/Task.cpp b/stdlib/public/Concurrency/Task.cpp
index e8134b3558d20..7aead9fd0c191 100644
--- a/stdlib/public/Concurrency/Task.cpp
+++ b/stdlib/public/Concurrency/Task.cpp
@@ -24,11 +24,11 @@
 #include "Debug.h"
 #include "Error.h"
 #include "TaskGroupPrivate.h"
+#include "TaskLocal.h"
 #include "TaskPrivate.h"
 #include "Tracing.h"
 #include "swift/ABI/Metadata.h"
 #include "swift/ABI/Task.h"
-#include "swift/ABI/TaskLocal.h"
 #include "swift/ABI/TaskOptions.h"
 #include "swift/Basic/Lazy.h"
 #include "swift/Runtime/Concurrency.h"
diff --git a/stdlib/public/Concurrency/TaskLocal.cpp b/stdlib/public/Concurrency/TaskLocal.cpp
index c7b9a335a190f..99b0c7f05ee6d 100644
--- a/stdlib/public/Concurrency/TaskLocal.cpp
+++ b/stdlib/public/Concurrency/TaskLocal.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/ABI/TaskLocal.h"
+#include "TaskLocal.h"
 #include "../CompatibilityOverride/CompatibilityOverride.h"
 #include "TaskPrivate.h"
 #include "swift/ABI/Actor.h"
diff --git a/include/swift/ABI/TaskLocal.h b/stdlib/public/Concurrency/TaskLocal.h
similarity index 100%
rename from include/swift/ABI/TaskLocal.h
rename to stdlib/public/Concurrency/TaskLocal.h
diff --git a/stdlib/public/Concurrency/TaskPrivate.h b/stdlib/public/Concurrency/TaskPrivate.h
index 75b0323c4392c..82436a28cd7ab 100644
--- a/stdlib/public/Concurrency/TaskPrivate.h
+++ b/stdlib/public/Concurrency/TaskPrivate.h
@@ -18,6 +18,7 @@
 #define SWIFT_CONCURRENCY_TASKPRIVATE_H
 
 #include "Error.h"
+#include "TaskLocal.h"
 #include "Tracing.h"
 #include "swift/ABI/Metadata.h"
 #include "swift/ABI/Task.h"