diff --git a/src/gfxstream/codegen/scripts/cerealgenerator.py b/src/gfxstream/codegen/scripts/cerealgenerator.py
index 13fe908bc6a..0e0a746f925 100644
--- a/src/gfxstream/codegen/scripts/cerealgenerator.py
+++ b/src/gfxstream/codegen/scripts/cerealgenerator.py
@@ -261,7 +261,7 @@ class CerealGenerator(OutputGenerator):
 
         # THe host always needs all possible guest struct definitions, while the guest only needs
         # platform sepcific headers.
-        self.hostCommonExtraVulkanHeaders = '#include "vk_android_native_buffer.h"'
+        self.hostCommonExtraVulkanHeaders = '#include "vk_android_native_buffer_gfxstream.h"'
         self.host_cmake_generator = lambda cppFiles: f"""{autogeneratedMkTemplate % banner_command(sys.argv)}
 add_library(OpenglRender_vulkan_cereal {cppFiles})
 target_compile_definitions(OpenglRender_vulkan_cereal PRIVATE -DVK_GOOGLE_gfxstream)
@@ -729,6 +729,7 @@ class BumpPool;
         if (not suppressVulkanHeaders):
             module.headerPreamble += "#include <vulkan/vulkan.h>\n"
             module.headerPreamble += '#include "vulkan_gfxstream.h"\n'
+            module.headerPreamble += '#include "vk_android_native_buffer_gfxstream.h"\n'
         module.headerPreamble += extraHeader + '\n'
         if useNamespace:
             module.headerPreamble += namespaceBegin