diff --git a/gn/core.gni b/gn/core.gni
index d333206..3face62 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -252,6 +252,7 @@
   "$_src/core/SkMatrixImageFilter.cpp",
   "$_src/core/SkMatrixImageFilter.h",
   "$_src/core/SkMatrixUtils.h",
+  "$_src/core/SkMessageBus.h",
   "$_src/core/SkMipMap.cpp",
   "$_src/core/SkMipMap.h",
   "$_src/core/SkModeColorFilter.cpp",
@@ -449,7 +450,6 @@
   "$_include/private/SkFloatingPoint.h",
   "$_include/private/SkHalf.h",
   "$_include/private/SkMalloc.h",
-  "$_include/private/SkMessageBus.h",
   "$_include/private/SkMutex.h",
   "$_include/private/SkNoncopyable.h",
   "$_include/private/SkNx.h",
diff --git a/src/core/SkClipStack.h b/src/core/SkClipStack.h
index f8653d7..5f502ee 100644
--- a/src/core/SkClipStack.h
+++ b/src/core/SkClipStack.h
@@ -14,8 +14,8 @@
 #include "include/core/SkRRect.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkRegion.h"
-#include "include/private/SkMessageBus.h"
 #include "src/core/SkClipOpPriv.h"
+#include "src/core/SkMessageBus.h"
 #include "src/core/SkTLazy.h"
 
 #if SK_SUPPORT_GPU
diff --git a/src/core/SkDeferredDisplayListRecorder.cpp b/src/core/SkDeferredDisplayListRecorder.cpp
index 4925edd..1b0168e 100644
--- a/src/core/SkDeferredDisplayListRecorder.cpp
+++ b/src/core/SkDeferredDisplayListRecorder.cpp
@@ -9,7 +9,7 @@
 #include "include/core/SkSurface.h"
 #include "include/core/SkSurfaceCharacterization.h"
 #include "include/private/SkDeferredDisplayList.h"
-#include "include/private/SkMessageBus.h"
+#include "src/core/SkMessageBus.h"
 
 #if !SK_SUPPORT_GPU
 SkDeferredDisplayListRecorder::SkDeferredDisplayListRecorder(const SkSurfaceCharacterization&) {}
diff --git a/include/private/SkMessageBus.h b/src/core/SkMessageBus.h
similarity index 100%
rename from include/private/SkMessageBus.h
rename to src/core/SkMessageBus.h
diff --git a/src/core/SkPromiseImageTexture.cpp b/src/core/SkPromiseImageTexture.cpp
index 761ae93..d8d8dfe 100644
--- a/src/core/SkPromiseImageTexture.cpp
+++ b/src/core/SkPromiseImageTexture.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "include/core/SkPromiseImageTexture.h"
-#include "include/private/SkMessageBus.h"
+#include "src/core/SkMessageBus.h"
 
 #if SK_SUPPORT_GPU
 
diff --git a/src/core/SkResourceCache.cpp b/src/core/SkResourceCache.cpp
index ff52a49..a528430 100644
--- a/src/core/SkResourceCache.cpp
+++ b/src/core/SkResourceCache.cpp
@@ -8,10 +8,10 @@
 #include "src/core/SkResourceCache.h"
 
 #include "include/core/SkTraceMemoryDump.h"
-#include "include/private/SkMessageBus.h"
 #include "include/private/SkMutex.h"
 #include "include/private/SkTo.h"
 #include "src/core/SkDiscardableMemory.h"
+#include "src/core/SkMessageBus.h"
 #include "src/core/SkMipMap.h"
 #include "src/core/SkOpts.h"
 
diff --git a/src/core/SkResourceCache.h b/src/core/SkResourceCache.h
index 0e183f7..4805b28 100644
--- a/src/core/SkResourceCache.h
+++ b/src/core/SkResourceCache.h
@@ -9,8 +9,8 @@
 #define SkResourceCache_DEFINED
 
 #include "include/core/SkBitmap.h"
-#include "include/private/SkMessageBus.h"
 #include "include/private/SkTDArray.h"
+#include "src/core/SkMessageBus.h"
 
 class SkCachedData;
 class SkDiscardableMemory;
diff --git a/src/gpu/GrAHardwareBufferImageGenerator.cpp b/src/gpu/GrAHardwareBufferImageGenerator.cpp
index 59f59a9..8bb6be5 100644
--- a/src/gpu/GrAHardwareBufferImageGenerator.cpp
+++ b/src/gpu/GrAHardwareBufferImageGenerator.cpp
@@ -22,8 +22,8 @@
 #include "include/gpu/gl/GrGLTypes.h"
 #include "include/private/GrRecordingContext.h"
 #include "include/private/GrTextureProxy.h"
-#include "include/private/SkMessageBus.h"
 #include "src/core/SkExchange.h"
+#include "src/core/SkMessageBus.h"
 #include "src/gpu/GrAHardwareBufferUtils.h"
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrProxyProvider.h"
diff --git a/src/gpu/GrBackendTextureImageGenerator.cpp b/src/gpu/GrBackendTextureImageGenerator.cpp
index 7c3e403..4df0bd4 100644
--- a/src/gpu/GrBackendTextureImageGenerator.cpp
+++ b/src/gpu/GrBackendTextureImageGenerator.cpp
@@ -8,7 +8,7 @@
 #include "include/gpu/GrContext.h"
 #include "include/gpu/GrTexture.h"
 #include "include/private/GrRecordingContext.h"
-#include "include/private/SkMessageBus.h"
+#include "src/core/SkMessageBus.h"
 #include "src/gpu/GrBackendTextureImageGenerator.h"
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrGpu.h"
diff --git a/src/gpu/GrResourceCache.cpp b/src/gpu/GrResourceCache.cpp
index bbd7f70..4dd0481 100644
--- a/src/gpu/GrResourceCache.cpp
+++ b/src/gpu/GrResourceCache.cpp
@@ -10,10 +10,10 @@
 #include "include/gpu/GrContext.h"
 #include "include/gpu/GrTexture.h"
 #include "include/private/GrSingleOwner.h"
-#include "include/private/SkMessageBus.h"
 #include "include/private/SkTo.h"
 #include "include/utils/SkRandom.h"
 #include "src/core/SkExchange.h"
+#include "src/core/SkMessageBus.h"
 #include "src/core/SkOpts.h"
 #include "src/core/SkScopeExit.h"
 #include "src/core/SkTSort.h"
diff --git a/src/gpu/GrResourceCache.h b/src/gpu/GrResourceCache.h
index 99b8e52..7796b23 100644
--- a/src/gpu/GrResourceCache.h
+++ b/src/gpu/GrResourceCache.h
@@ -11,10 +11,10 @@
 #include "include/core/SkRefCnt.h"
 #include "include/gpu/GrGpuResource.h"
 #include "include/private/GrResourceKey.h"
-#include "include/private/SkMessageBus.h"
 #include "include/private/SkTArray.h"
 #include "include/private/SkTHash.h"
 #include "include/private/SkTInternalLList.h"
+#include "src/core/SkMessageBus.h"
 #include "src/core/SkTDPQueue.h"
 #include "src/core/SkTMultiMap.h"
 #include "src/gpu/GrGpuResourceCacheAccess.h"
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 40c9196..5f0e9dc 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -14,12 +14,12 @@
 #include "include/private/GrRecordingContext.h"
 #include "include/private/GrTextureProxy.h"
 #include "include/private/SkImageInfoPriv.h"
-#include "include/private/SkMessageBus.h"
 #include "include/private/SkTemplates.h"
 #include "src/core/SkAutoMalloc.h"
 #include "src/core/SkBlendModePriv.h"
 #include "src/core/SkImagePriv.h"
 #include "src/core/SkMaskFilterBase.h"
+#include "src/core/SkMessageBus.h"
 #include "src/core/SkMipMap.h"
 #include "src/core/SkPaintPriv.h"
 #include "src/core/SkResourceCache.h"
diff --git a/src/gpu/text/GrTextBlobCache.h b/src/gpu/text/GrTextBlobCache.h
index f23ee82..5479112 100644
--- a/src/gpu/text/GrTextBlobCache.h
+++ b/src/gpu/text/GrTextBlobCache.h
@@ -9,9 +9,9 @@
 #define GrTextBlobCache_DEFINED
 
 #include "include/core/SkRefCnt.h"
-#include "include/private/SkMessageBus.h"
 #include "include/private/SkTArray.h"
 #include "include/private/SkTHash.h"
+#include "src/core/SkMessageBus.h"
 #include "src/core/SkTextBlobPriv.h"
 #include "src/gpu/text/GrTextBlob.h"
 
diff --git a/tests/MessageBusTest.cpp b/tests/MessageBusTest.cpp
index 1bc4dbb..e1f3062 100644
--- a/tests/MessageBusTest.cpp
+++ b/tests/MessageBusTest.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "include/private/SkMessageBus.h"
+#include "src/core/SkMessageBus.h"
 #include "tests/Test.h"
 
 namespace {
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index 7cf5d4c..f4b90c3 100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -21,7 +21,7 @@
 
 #include "include/core/SkCanvas.h"
 #include "include/core/SkSurface.h"
-#include "include/private/SkMessageBus.h"
+#include "src/core/SkMessageBus.h"
 #include "src/core/SkMipMap.h"
 #include "src/gpu/SkGr.h"
 #include "tests/Test.h"