diff --git a/src/gfxstream/guest/vulkan/meson.build b/src/gfxstream/guest/vulkan/meson.build
index 9429af5b246..b00d5e39a1f 100644
--- a/src/gfxstream/guest/vulkan/meson.build
+++ b/src/gfxstream/guest/vulkan/meson.build
@@ -18,6 +18,14 @@ if with_platform_wayland
    gfxstream_vk_wsi_args += '-DGFXSTREAM_VK_WAYLAND'
 endif
 
+gfxstream_deps = [dep_libdrm, idep_vulkan_wsi_headers,
+                  idep_vulkan_lite_runtime, idep_vulkan_util_headers,
+                  idep_vulkan_wsi, dep_valgrind]
+
+if with_perfetto
+  gfxstream_deps += dep_perfetto
+endif
+
 lib_vulkan_gfxstream = shared_library(
    'vulkan_gfxstream',
    files_lib_vulkan_gfxstream + files_lib_vulkan_enc + gfxstream_vk_entrypoints +
@@ -32,9 +40,7 @@ lib_vulkan_gfxstream = shared_library(
                libconnection_manager, libaemu],
    link_args: [vulkan_icd_link_args, ld_args_bsymbolic, ld_args_gc_sections],
    link_depends: vulkan_icd_link_depends,
-   dependencies: [dep_libdrm, idep_vulkan_wsi_headers,
-                  idep_vulkan_lite_runtime, idep_vulkan_util_headers,
-                  idep_vulkan_wsi, dep_valgrind],
+   dependencies: gfxstream_deps,
    install: true,
 )
 
diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
index c03be1514f8..4702897bc2b 100644
--- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
+++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
@@ -37,7 +37,11 @@
 #include <unordered_set>
 
 #ifdef HAVE_PERFETTO
+#ifndef ANDROID_LIBPERFETTO
+#include <perfetto.h>
+#else
 #include <perfetto/tracing.h>
+#endif
 
 #define GFXSTREAM_TRACE_DEFAULT_CATEGORY "gfxstream.default"