diff --git a/src/gfxstream/codegen/scripts/cereal/extensionstructs.py b/src/gfxstream/codegen/scripts/cereal/extensionstructs.py
index f6e30a962b3..68115154fd6 100644
--- a/src/gfxstream/codegen/scripts/cereal/extensionstructs.py
+++ b/src/gfxstream/codegen/scripts/cereal/extensionstructs.py
@@ -110,7 +110,7 @@ class VulkanExtensionStructs(VulkanWrapperGenerator):
             # emitForEachStructExtension and not accessible here. Consequently,
             # this is a copy-paste from there and must be updated accordingly.
             # NOTE: No need for %% if no substitution is made.
-            cgen.stmt("fprintf(stderr, \"Unhandled Vulkan structure type %d, aborting.\\n\", structType)")
+            cgen.stmt("fprintf(stderr, \"Unhandled Vulkan structure type %s [%d], aborting.\\n\", string_VkStructureType(VkStructureType(structType)), structType)")
             cgen.stmt("GFXSTREAM_ABORT(::emugl::FatalError(::emugl::ABORT_REASON_OTHER))")
             cgen.stmt("return (%s)0" % self.extensionStructSizeRetType.typeName)
 
diff --git a/src/gfxstream/codegen/scripts/cerealgenerator.py b/src/gfxstream/codegen/scripts/cerealgenerator.py
index be52de3f1ff..dc70c046b70 100644
--- a/src/gfxstream/codegen/scripts/cerealgenerator.py
+++ b/src/gfxstream/codegen/scripts/cerealgenerator.py
@@ -447,6 +447,7 @@ using DlSymFunc = void* (void*, const char*);
 {self.hostCommonExtraVulkanHeaders}
 #include "goldfish_vk_private_defs.h"
 #include "host-common/GfxstreamFatalError.h"
+#include "vulkan/vk_enum_string_helper.h"
 """
 
         extensionStructsIncludeGuest = """