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"