diff --git a/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.cpp b/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.cpp
index 1a88d55feda..422d54f93cc 100644
--- a/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.cpp
+++ b/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.cpp
@@ -14,6 +14,7 @@
 #include "VulkanStreamGuest.h"
 
 #include "util/log.h"
+#include "util/perf/cpu_trace.h"
 
 namespace gfxstream {
 namespace vk {
@@ -128,7 +129,7 @@ void VulkanStreamGuest::unsetHandleMapping() { mCurrentHandleMapping = &mDefault
 VulkanHandleMapping* VulkanStreamGuest::handleMapping() const { return mCurrentHandleMapping; }
 
 void VulkanStreamGuest::flush() {
-    AEMU_SCOPED_TRACE("VulkanStreamGuest device write");
+    MESA_TRACE_SCOPE("VulkanStreamGuest device write");
     mStream->flush();
 }
 
diff --git a/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.h b/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.h
index 37436bc47a6..3190a2a2d0b 100644
--- a/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.h
+++ b/src/gfxstream/guest/vulkan_enc/VulkanStreamGuest.h
@@ -21,7 +21,6 @@
 #include "ResourceTracker.h"
 #include "VulkanHandleMapping.h"
 #include "aemu/base/BumpPool.h"
-#include "aemu/base/Tracing.h"
 #include "aemu/base/files/Stream.h"
 #include "aemu/base/files/StreamSerializing.h"
 #include "gfxstream/guest/IOStream.h"
diff --git a/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl b/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl
index 3b4cf324d99..8e27e9c06a6 100644
--- a/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl
+++ b/src/gfxstream/guest/vulkan_enc/vkQueueFlushCommandsGOOGLE_encode_impl.cpp.inl
@@ -55,7 +55,7 @@ if (watchdog) {
     memcpy(&healthMonitorAnnotation_packetContents[0], packetBeginPtr, watchdogBufSize);
 }
 
-AEMU_SCOPED_TRACE("vkQueueFlush large xfer");
+MESA_TRACE_SCOPE("vkQueueFlush large xfer");
 stream->flush();
 stream->writeLarge(local_pData, dataSize);