diff --git a/registry/vulkan/scripts/cerealgenerator.py b/registry/vulkan/scripts/cerealgenerator.py
index 988cda4..12c07fb 100644
--- a/registry/vulkan/scripts/cerealgenerator.py
+++ b/registry/vulkan/scripts/cerealgenerator.py
@@ -178,7 +178,10 @@
 #include "{self.guestBaseLibDirPrefix}/AndroidHealthMonitor.h"
 #include "goldfish_vk_private_defs.h"
 #include <memory>
+
+namespace gfxstream {{
 class IOStream;
+}}
 """
         encoderImplInclude = f"""
 #include "EncoderDebug.h"
@@ -413,8 +416,8 @@
 #include "{self.baseLibDirPrefix}/system/System.h"
 #include "{self.baseLibDirPrefix}/Tracing.h"
 #include "{self.baseLibDirPrefix}/Metrics.h"
+#include "render-utils/IOStream.h"
 #include "stream-servers/FrameBuffer.h"
-#include "stream-servers/IOStream.h"
 #include "host-common/feature_control.h"
 #include "host-common/GfxstreamFatalError.h"
 #include "host-common/logging.h"