diff --git a/registry/vulkan/scripts/cerealgenerator.py b/registry/vulkan/scripts/cerealgenerator.py
index 3adc29f..783401e 100644
--- a/registry/vulkan/scripts/cerealgenerator.py
+++ b/registry/vulkan/scripts/cerealgenerator.py
@@ -248,7 +248,7 @@
 #include "goldfish_vk_private_defs.h"
 
 #include "%s.h"
-#include "{self.baseLibDirPrefix}/StreamSerializing.h"
+#include "{self.baseLibDirPrefix}/files/StreamSerializing.h"
 """ % VULKAN_STREAM_TYPE
 
         testingInclude = f"""
@@ -372,7 +372,7 @@
 #include "VkDecoderGlobalState.h"
 #include "VkReconstruction.h"
 
-#include "{self.baseLibDirPrefix}/Lock.h"
+#include "{self.baseLibDirPrefix}/synchronization/Lock.h"
 """
 
         decoderHeaderIncludes = f"""
@@ -395,7 +395,7 @@
 #include "common/goldfish_vk_transform.h"
 
 #include "{self.baseLibDirPrefix}/BumpPool.h"
-#include "{self.baseLibDirPrefix}/System.h"
+#include "{self.baseLibDirPrefix}/system/System.h"
 #include "{self.baseLibDirPrefix}/Tracing.h"
 #include "{self.baseLibDirPrefix}/Metrics.h"
 #include "stream-servers/IOStream.h"