diff --git a/src/gfxstream/codegen/scripts/cereal/common/codegen.py b/src/gfxstream/codegen/scripts/cereal/common/codegen.py
index 3ffc30c42c9..83e0f5c405d 100644
--- a/src/gfxstream/codegen/scripts/cereal/common/codegen.py
+++ b/src/gfxstream/codegen/scripts/cereal/common/codegen.py
@@ -821,7 +821,7 @@ class CodeGen(object):
         if variant == "guest":
             streamNamespace = "gfxstream::aemu"
         else:
-            streamNamespace = "android::base"
+            streamNamespace = "gfxstream"
 
         if direction == "read":
             self.stmt("memcpy((%s*)&%s, %s, %s)" %
diff --git a/src/gfxstream/codegen/scripts/cereal/decodersnapshot.py b/src/gfxstream/codegen/scripts/cereal/decodersnapshot.py
index 860d563d942..14227df1679 100644
--- a/src/gfxstream/codegen/scripts/cereal/decodersnapshot.py
+++ b/src/gfxstream/codegen/scripts/cereal/decodersnapshot.py
@@ -16,11 +16,15 @@ from dataclasses import dataclass
 
 decoder_snapshot_decl_preamble = """
 
+namespace gfxstream {
+class Stream;
+} // namespace gfxstream
+
 namespace gfxstream {
 namespace base {
 class BumpPool;
-} // namespace base {
-} // namespace gfxstream {
+} // namespace base
+} // namespace gfxstream
 
 namespace gfxstream {
 namespace vk {
@@ -32,8 +36,8 @@ class VkDecoderSnapshot {
 
     void clear();
 
-    void saveReplayBuffers(android::base::Stream* stream);
-    static void loadReplayBuffers(android::base::Stream* stream, std::vector<uint64_t>* outHandleBuffer, std::vector<uint8_t>* outDecoderBuffer);
+    void saveReplayBuffers(gfxstream::Stream* stream);
+    static void loadReplayBuffers(gfxstream::Stream* stream, std::vector<uint64_t>* outHandleBuffer, std::vector<uint8_t>* outDecoderBuffer);
 
     VkSnapshotApiCallInfo* createApiCallInfo();
     void destroyApiCallInfoIfUnused(VkSnapshotApiCallInfo* info);
@@ -66,12 +70,12 @@ class VkDecoderSnapshot::Impl {
         mReconstruction.clear();
     }
 
-    void saveReplayBuffers(android::base::Stream* stream) {
+    void saveReplayBuffers(gfxstream::Stream* stream) {
         std::lock_guard<std::mutex> lock(mReconstructionMutex);
         mReconstruction.saveReplayBuffers(stream);
     }
 
-    static void loadReplayBuffers(android::base::Stream* stream, std::vector<uint64_t>* outHandleBuffer, std::vector<uint8_t>* outDecoderBuffer) {
+    static void loadReplayBuffers(gfxstream::Stream* stream, std::vector<uint64_t>* outHandleBuffer, std::vector<uint8_t>* outDecoderBuffer) {
         VkReconstruction::loadReplayBuffers(stream, outHandleBuffer, outDecoderBuffer);
     }
 
@@ -99,12 +103,12 @@ void VkDecoderSnapshot::clear() {
     mImpl->clear();
 }
 
-void VkDecoderSnapshot::saveReplayBuffers(android::base::Stream* stream) {
+void VkDecoderSnapshot::saveReplayBuffers(gfxstream::Stream* stream) {
     mImpl->saveReplayBuffers(stream);
 }
 
 /*static*/
-void VkDecoderSnapshot::loadReplayBuffers(android::base::Stream* stream, std::vector<uint64_t>* outHandleBuffer, std::vector<uint8_t>* outDecoderBuffer) {
+void VkDecoderSnapshot::loadReplayBuffers(gfxstream::Stream* stream, std::vector<uint64_t>* outHandleBuffer, std::vector<uint8_t>* outDecoderBuffer) {
     VkDecoderSnapshot::Impl::loadReplayBuffers(stream, outHandleBuffer, outDecoderBuffer);
 }
 
diff --git a/src/gfxstream/codegen/scripts/cereal/reservedmarshaling.py b/src/gfxstream/codegen/scripts/cereal/reservedmarshaling.py
index 58a93622318..32916bad251 100644
--- a/src/gfxstream/codegen/scripts/cereal/reservedmarshaling.py
+++ b/src/gfxstream/codegen/scripts/cereal/reservedmarshaling.py
@@ -117,7 +117,7 @@ class VulkanReservedMarshalingCodegen(VulkanTypeIterator):
             if self.variant == "guest":
                 streamNamespace = "gfxstream::aemu"
             else:
-                streamNamespace = "android::base"
+                streamNamespace = "gfxstream"
             if self.direction == "write":
                 self.cgen.stmt("%s::Stream::%s((uint8_t*)*%s)" % (streamNamespace, streamMethod, varname))
             else:
@@ -976,7 +976,7 @@ class VulkanReservedMarshaling(VulkanWrapperGenerator):
         if self.variant == "guest":
             streamNamespace = "gfxstream::aemu"
         else:
-            streamNamespace = "android::base"
+            streamNamespace = "gfxstream"
 
         if direction == "write":
             cgen.stmt("memcpy(*%s, &%s, sizeof(uint32_t));" % (self.ptrVarName, sizeVar))
diff --git a/src/gfxstream/codegen/scripts/cerealgenerator.py b/src/gfxstream/codegen/scripts/cerealgenerator.py
index 0a91761c2a7..0ea334e8674 100644
--- a/src/gfxstream/codegen/scripts/cerealgenerator.py
+++ b/src/gfxstream/codegen/scripts/cerealgenerator.py
@@ -394,7 +394,7 @@ class IOStream;
 #include "goldfish_vk_private_defs.h"
 
 #include "%s.h"
-#include "aemu/base/files/StreamSerializing.h"
+#include "gfxstream/host/stream_utils.h"
 """ % VULKAN_STREAM_TYPE
 
         poolInclude = f"""