diff --git a/src/gfxstream/codegen/scripts/cereal/encoder.py b/src/gfxstream/codegen/scripts/cereal/encoder.py
index dadac946688..c2f1786d5e2 100644
--- a/src/gfxstream/codegen/scripts/cereal/encoder.py
+++ b/src/gfxstream/codegen/scripts/cereal/encoder.py
@@ -482,8 +482,6 @@ def emit_debug_log(typeInfo, api, cgen):
     logFormatStr = ", ".join(logFormat)
     logVargsStr = ", ".join(logVargs)
 
-    cgen.stmt("ENCODER_DEBUG_LOG(\"%s(%s)\", %s)" % (api.name, logFormatStr, logVargsStr))
-
 def emit_default_encoding(typeInfo, api, cgen):
     emit_debug_log(typeInfo, api, cgen)
     emit_lock(cgen)
diff --git a/src/gfxstream/codegen/scripts/cerealgenerator.py b/src/gfxstream/codegen/scripts/cerealgenerator.py
index 78492f15e98..f7c0176b91e 100644
--- a/src/gfxstream/codegen/scripts/cerealgenerator.py
+++ b/src/gfxstream/codegen/scripts/cerealgenerator.py
@@ -321,7 +321,6 @@ class IOStream;
 }}  // namespace gfxstream
 """
         encoderImplInclude = f"""
-#include "EncoderDebug.h"
 #include "Resources.h"
 #include "ResourceTracker.h"
 #include "Validation.h"
@@ -331,8 +330,6 @@ class IOStream;
 #include "{self.guestBaseLibDirPrefix}/AlignedBuf.h"
 #include "{self.guestBaseLibDirPrefix}/BumpPool.h"
 
-#include <cutils/properties.h>
-
 #include "goldfish_vk_marshaling_guest.h"
 #include "goldfish_vk_reserved_marshaling_guest.h"
 #include "goldfish_vk_deepcopy_guest.h"
@@ -356,7 +353,6 @@ class IOStream;
 
 #include "goldfish_vk_private_defs.h"
 
-#include <log/log.h>
 #include <cstring>
 
 // Stuff we are not going to use but if included,
diff --git a/src/gfxstream/guest/vulkan_enc/VkEncoder.cpp.inl b/src/gfxstream/guest/vulkan_enc/VkEncoder.cpp.inl
index 178ed4e520c..77adba3af38 100644
--- a/src/gfxstream/guest/vulkan_enc/VkEncoder.cpp.inl
+++ b/src/gfxstream/guest/vulkan_enc/VkEncoder.cpp.inl
@@ -2,6 +2,8 @@ static ResourceTracker* sResourceTracker = nullptr;
 static uint32_t sFeatureBits = 0;
 static constexpr uint32_t kWatchdogBufferMax = 1'000;
 
+#include <cutils/properties.h>
+
 class VkEncoder::Impl {
    public:
     Impl(gfxstream::guest::IOStream* stream) : m_stream(stream), m_logEncodes(false) {