Reorganize base headers.

Bug: 237805597
Test: presubmit
Change-Id: I747a5653bf4da29913b722fb1927bf49cabf5636

114 files changed, 209 insertions, 209 deletions

diff --git a/fake-android-guest/androidImpl/AndroidBufferQueue.cpp b/fake-android-guest/androidImpl/AndroidBufferQueue.cpp
index 17e9a5cf..56c9ec24 100644
--- a/fake-android-guest/androidImpl/AndroidBufferQueue.cpp
+++ b/fake-android-guest/androidImpl/AndroidBufferQueue.cpp
@@ -13,7 +13,7 @@
 // limitations under the License.#pragma once
 #include "AndroidBufferQueue.h"
 
-#include "base/MessageChannel.h"
+#include "base/synchronization/MessageChannel.h"
 
 using android::base::MessageChannel;
 
diff --git a/fake-android-guest/androidImpl/Ashmem.cpp b/fake-android-guest/androidImpl/Ashmem.cpp
index 41e3ce05..3d61a8f7 100644
--- a/fake-android-guest/androidImpl/Ashmem.cpp
+++ b/fake-android-guest/androidImpl/Ashmem.cpp
@@ -13,8 +13,8 @@
 // limitations under the License.
 #include <cutils/ashmem.h>
 
-#include "base/Lookup.h"
-#include "base/SharedMemory.h"
+#include "base/containers/Lookup.h"
+#include "base/memory/SharedMemory.h"
 
 #include "AndroidHostCommon.h"
 #include "Ashmem.h"
diff --git a/fake-android-guest/androidImpl/Properties.cpp b/fake-android-guest/androidImpl/Properties.cpp
index efffca57..95f4913a 100644
--- a/fake-android-guest/androidImpl/Properties.cpp
+++ b/fake-android-guest/androidImpl/Properties.cpp
@@ -15,7 +15,7 @@
 
 #include "AndroidHostCommon.h"
 
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 
 #include <string>
 #include <unordered_map>
diff --git a/fake-android-guest/androidImpl/SurfaceFlinger.h b/fake-android-guest/androidImpl/SurfaceFlinger.h
index de4901f3..49f01e00 100644
--- a/fake-android-guest/androidImpl/SurfaceFlinger.h
+++ b/fake-android-guest/androidImpl/SurfaceFlinger.h
@@ -19,7 +19,7 @@
 
 #include <system/window.h>
 
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 
 #include <functional>
 #include <memory>
diff --git a/fake-android-guest/androidImpl/Vsync.cpp b/fake-android-guest/androidImpl/Vsync.cpp
index aca95463..0fd27a52 100644
--- a/fake-android-guest/androidImpl/Vsync.cpp
+++ b/fake-android-guest/androidImpl/Vsync.cpp
@@ -13,10 +13,10 @@
 // limitations under the License.
 #include "Vsync.h"
 
-#include "base/ConditionVariable.h"
-#include "base/Lock.h"
-#include "base/System.h"
-#include "base/FunctorThread.h"
+#include "base/synchronization/ConditionVariable.h"
+#include "base/synchronization/Lock.h"
+#include "base/system/System.h"
+#include "base/threads/FunctorThread.h"
 
 #include <atomic>
 #include <memory>
diff --git a/fake-android-guest/libvulkan/driver.cpp b/fake-android-guest/libvulkan/driver.cpp
index 3e9d5cab..021de0b7 100644
--- a/fake-android-guest/libvulkan/driver.cpp
+++ b/fake-android-guest/libvulkan/driver.cpp
@@ -30,8 +30,8 @@
 #include "driver.h"
 #include "stubhal.h"
 
-#include "base/System.h"
-#include "base/PathUtils.h"
+#include "base/system/System.h"
+#include "base/files/PathUtils.h"
 
 #include <vector>
 
diff --git a/fake-android-guest/libvulkan/layers_extensions.cpp b/fake-android-guest/libvulkan/layers_extensions.cpp
index 9773fc3d..4cbea937 100644
--- a/fake-android-guest/libvulkan/layers_extensions.cpp
+++ b/fake-android-guest/libvulkan/layers_extensions.cpp
@@ -16,8 +16,8 @@
 
 #include "layers_extensions.h"
 
-#include "base/System.h"
-#include "base/PathUtils.h"
+#include "base/system/System.h"
+#include "base/files/PathUtils.h"
 
 #include <alloca.h>
 #include <dirent.h>
diff --git a/include/render-utils/RenderChannel.h b/include/render-utils/RenderChannel.h
index 42f8e5ab..0f4d380a 100644
--- a/include/render-utils/RenderChannel.h
+++ b/include/render-utils/RenderChannel.h
@@ -14,9 +14,9 @@
 #pragma once
 
 #include "base/EnumFlags.h"
-#include "base/BufferQueue.h"
-#include "base/SmallVector.h"
-#include "base/Stream.h"
+#include "base/containers/SmallVector.h"
+#include "base/files/Stream.h"
+#include "base/containers/BufferQueue.h"
 
 #include <functional>
 #include <memory>
diff --git a/include/render-utils/RenderLib.h b/include/render-utils/RenderLib.h
index 23ba43fc..39145f7c 100644
--- a/include/render-utils/RenderLib.h
+++ b/include/render-utils/RenderLib.h
@@ -15,7 +15,7 @@
 
 #include <memory>
 
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 #include "host-common/RefcountPipe.h"
 #include "host-common/vm_operations.h"
 #include "host-common/window_agent.h"
diff --git a/include/render-utils/Renderer.h b/include/render-utils/Renderer.h
index ad86d804..2d9c8656 100644
--- a/include/render-utils/Renderer.h
+++ b/include/render-utils/Renderer.h
@@ -13,7 +13,7 @@
 // limitations under the License.
 #pragma once
 
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 #include "base/ring_buffer.h"
 #include "host-common/address_space_graphics_types.h"
 #include "render-utils/RenderChannel.h"
diff --git a/stream-servers/ColorBuffer.h b/stream-servers/ColorBuffer.h
index b48d5331..1dbf651d 100644
--- a/stream-servers/ColorBuffer.h
+++ b/stream-servers/ColorBuffer.h
@@ -30,7 +30,7 @@
 #include "Handle.h"
 #include "Hwc2.h"
 #include "base/ManagedDescriptor.hpp"
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 #include "snapshot/LazySnapshotObj.h"
 
 // From ANGLE "src/common/angleutils.h"
diff --git a/stream-servers/FenceSync.cpp b/stream-servers/FenceSync.cpp
index 922692b2..0a623865 100644
--- a/stream-servers/FenceSync.cpp
+++ b/stream-servers/FenceSync.cpp
@@ -24,10 +24,10 @@
 #include "RenderThreadInfo.h"
 #include "StalePtrRegistry.h"
 
-#include "base/Lookup.h"
-#include "base/StaticMap.h"
-#include "base/StreamSerializing.h"
-#include "base/Lock.h"
+#include "base/containers/Lookup.h"
+#include "base/containers/StaticMap.h"
+#include "base/files/StreamSerializing.h"
+#include "base/synchronization/Lock.h"
 
 using android::base::AutoLock;
 using android::base::Lock;
diff --git a/stream-servers/FenceSync.h b/stream-servers/FenceSync.h
index 62d2048f..a8afc46a 100644
--- a/stream-servers/FenceSync.h
+++ b/stream-servers/FenceSync.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include "base/Compiler.h"
-#include "base/Stream.h"
-#include "base/Lock.h"
+#include "base/files/Stream.h"
+#include "base/synchronization/Lock.h"
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
diff --git a/stream-servers/FrameBuffer.cpp b/stream-servers/FrameBuffer.cpp
index cdb85a29..6652ebca 100644
--- a/stream-servers/FrameBuffer.cpp
+++ b/stream-servers/FrameBuffer.cpp
@@ -33,13 +33,13 @@
 #include "RenderThreadInfoGl.h"
 #include "SyncThread.h"
 #include "base/LayoutResolver.h"
-#include "base/Lock.h"
-#include "base/Lookup.h"
-#include "base/MemoryTracker.h"
+#include "base/synchronization/Lock.h"
+#include "base/containers/Lookup.h"
+#include "base/memory/MemoryTracker.h"
 #include "base/Metrics.h"
 #include "base/SharedLibrary.h"
-#include "base/StreamSerializing.h"
-#include "base/System.h"
+#include "base/files/StreamSerializing.h"
+#include "base/system/System.h"
 #include "base/Tracing.h"
 #include "gl/YUVConverter.h"
 #include "gl/gles2_dec/gles2_dec.h"
diff --git a/stream-servers/FrameBuffer.h b/stream-servers/FrameBuffer.h
index 0fa3863b..6c4cee02 100644
--- a/stream-servers/FrameBuffer.h
+++ b/stream-servers/FrameBuffer.h
@@ -39,13 +39,13 @@
 #include "WindowSurface.h"
 #include "base/AsyncResult.h"
 #include "base/HealthMonitor.h"
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 #include "base/ManagedDescriptor.hpp"
-#include "base/MessageChannel.h"
+#include "base/synchronization/MessageChannel.h"
 #include "base/Metrics.h"
-#include "base/Stream.h"
-#include "base/Thread.h"
-#include "base/WorkerThread.h"
+#include "base/files/Stream.h"
+#include "base/threads/Thread.h"
+#include "base/threads/WorkerThread.h"
 #include "gl/CompositorGl.h"
 #include "gl/EmulatedEglConfig.h"
 #include "gl/GLESVersionDetector.h"
diff --git a/stream-servers/GfxStreamBackend.cpp b/stream-servers/GfxStreamBackend.cpp
index 8b831b02..aefc8021 100644
--- a/stream-servers/GfxStreamBackend.cpp
+++ b/stream-servers/GfxStreamBackend.cpp
@@ -23,10 +23,10 @@
 #include "GfxStreamAgents.h"
 #include "VkCommonOperations.h"
 #include "VulkanDispatch.h"
-#include "base/MemStream.h"
+#include "base/files/MemStream.h"
 #include "base/Metrics.h"
-#include "base/PathUtils.h"
-#include "base/System.h"
+#include "base/files/PathUtils.h"
+#include "base/system/System.h"
 #include "host-common/AndroidPipe.h"
 #include "host-common/FeatureControl.h"
 #include "host-common/GfxstreamFatalError.h"
diff --git a/stream-servers/IOStream.h b/stream-servers/IOStream.h
index abbadc8b..0a53ea4c 100644
--- a/stream-servers/IOStream.h
+++ b/stream-servers/IOStream.h
@@ -15,7 +15,7 @@
 */
 #pragma once
 
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 #include "host-common/logging.h"
 
 #include <assert.h>
diff --git a/stream-servers/PostWorker.h b/stream-servers/PostWorker.h
index 7f190fe9..502ce8aa 100644
--- a/stream-servers/PostWorker.h
+++ b/stream-servers/PostWorker.h
@@ -30,8 +30,8 @@
 #include "Hwc2.h"
 #include "PostCommands.h"
 #include "base/Compiler.h"
-#include "base/Lock.h"
-#include "base/MessageChannel.h"
+#include "base/synchronization/Lock.h"
+#include "base/synchronization/MessageChannel.h"
 #include "host-common/window_agent.h"
 
 class ColorBuffer;
diff --git a/stream-servers/ReadBuffer.h b/stream-servers/ReadBuffer.h
index da408561..9bdf01c1 100644
--- a/stream-servers/ReadBuffer.h
+++ b/stream-servers/ReadBuffer.h
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 #pragma once
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 #include "IOStream.h"
 
 namespace emugl {
diff --git a/stream-servers/ReadbackWorker.h b/stream-servers/ReadbackWorker.h
index b463cac1..bf8c2d97 100644
--- a/stream-servers/ReadbackWorker.h
+++ b/stream-servers/ReadbackWorker.h
@@ -22,7 +22,7 @@
 #include <vector>                               // for vector
 
 #include "base/Compiler.h"              // for DISALLOW_COPY_AND_ASSIGN
-#include "base/Lock.h"  // for Lock
+#include "base/synchronization/Lock.h"  // for Lock
 
 class ColorBuffer;
 class FrameBuffer;
diff --git a/stream-servers/RenderChannelImpl.cpp b/stream-servers/RenderChannelImpl.cpp
index a0f8eccb..290ffbb7 100644
--- a/stream-servers/RenderChannelImpl.cpp
+++ b/stream-servers/RenderChannelImpl.cpp
@@ -14,7 +14,7 @@
 #include "RenderChannelImpl.h"
 
 #include "RenderThread.h"
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 
 #include <algorithm>
 #include <utility>
diff --git a/stream-servers/RenderChannelImpl.h b/stream-servers/RenderChannelImpl.h
index caf724bf..0836d0fd 100644
--- a/stream-servers/RenderChannelImpl.h
+++ b/stream-servers/RenderChannelImpl.h
@@ -13,7 +13,7 @@
 // limitations under the License.
 #pragma once
 
-#include "base/BufferQueue.h"
+#include "base/containers/BufferQueue.h"
 #include "render-utils/RenderChannel.h"
 #include "RendererImpl.h"
 
diff --git a/stream-servers/RenderLibImpl.cpp b/stream-servers/RenderLibImpl.cpp
index 113bb6bc..1118c5b0 100644
--- a/stream-servers/RenderLibImpl.cpp
+++ b/stream-servers/RenderLibImpl.cpp
@@ -17,7 +17,7 @@
 #include "OpenGLESDispatch/EGLDispatch.h"
 #include "OpenGLESDispatch/DispatchTables.h"
 #include "RendererImpl.h"
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 #include "host-common/address_space_device_control_ops.h"
 #include "host-common/crash_reporter.h"
 #include "host-common/dma_device.h"
diff --git a/stream-servers/RenderThread.cpp b/stream-servers/RenderThread.cpp
index 5425ed9b..f8a663de 100644
--- a/stream-servers/RenderThread.cpp
+++ b/stream-servers/RenderThread.cpp
@@ -29,11 +29,11 @@
 #include "VkDecoderContext.h"
 #include "apigen-codec-common/ChecksumCalculatorThreadInfo.h"
 #include "base/HealthMonitor.h"
-#include "base/Lock.h"
-#include "base/MessageChannel.h"
+#include "base/synchronization/Lock.h"
+#include "base/synchronization/MessageChannel.h"
 #include "base/Metrics.h"
-#include "base/StreamSerializing.h"
-#include "base/System.h"
+#include "base/files/StreamSerializing.h"
+#include "base/system/System.h"
 #include "base/Tracing.h"
 #include "host-common/feature_control.h"
 #include "host-common/logging.h"
diff --git a/stream-servers/RenderThread.h b/stream-servers/RenderThread.h
index 9310fd2f..054dd94a 100644
--- a/stream-servers/RenderThread.h
+++ b/stream-servers/RenderThread.h
@@ -15,12 +15,12 @@
 */
 #pragma once
 
-#include "base/MemStream.h"
+#include "base/files/MemStream.h"
 #include "base/Optional.h"
 #include "host-common/address_space_graphics_types.h"
-#include "base/ConditionVariable.h"
-#include "base/Lock.h"
-#include "base/Thread.h"
+#include "base/synchronization/ConditionVariable.h"
+#include "base/synchronization/Lock.h"
+#include "base/threads/Thread.h"
 
 #include <atomic>
 #include <memory>
diff --git a/stream-servers/RenderThreadInfo.cpp b/stream-servers/RenderThreadInfo.cpp
index 4bf8dad4..f5fd1baa 100644
--- a/stream-servers/RenderThreadInfo.cpp
+++ b/stream-servers/RenderThreadInfo.cpp
@@ -16,7 +16,7 @@
 
 #include "RenderThreadInfo.h"
 
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 
 #include <unordered_map>
 #include <unordered_set>
diff --git a/stream-servers/RenderThreadInfo.h b/stream-servers/RenderThreadInfo.h
index bd45c21a..6a657213 100644
--- a/stream-servers/RenderThreadInfo.h
+++ b/stream-servers/RenderThreadInfo.h
@@ -20,7 +20,7 @@
 #include <memory>
 #include <unordered_set>
 
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 #include "renderControl_dec/renderControl_dec.h"
 #include "RenderThreadInfoGl.h"
 #include "RenderThreadInfoVk.h"
diff --git a/stream-servers/RenderThreadInfoGl.cpp b/stream-servers/RenderThreadInfoGl.cpp
index ee3bbd4c..669b1395 100644
--- a/stream-servers/RenderThreadInfoGl.cpp
+++ b/stream-servers/RenderThreadInfoGl.cpp
@@ -20,9 +20,9 @@
 #include "OpenGLESDispatch/EGLDispatch.h"
 #include "OpenGLESDispatch/GLESv1Dispatch.h"
 #include "OpenGLESDispatch/GLESv2Dispatch.h"
-#include "base/Lock.h"
-#include "base/Lookup.h"
-#include "base/StreamSerializing.h"
+#include "base/synchronization/Lock.h"
+#include "base/containers/Lookup.h"
+#include "base/files/StreamSerializing.h"
 #include "host-common/GfxstreamFatalError.h"
 
 using android::base::AutoLock;
diff --git a/stream-servers/RenderThreadInfoGl.h b/stream-servers/RenderThreadInfoGl.h
index bb0aef62..68b403e8 100644
--- a/stream-servers/RenderThreadInfoGl.h
+++ b/stream-servers/RenderThreadInfoGl.h
@@ -17,7 +17,7 @@
 #include <optional>
 #include <string>
 
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 #include "gl/gles1_dec/GLESv1Decoder.h"
 #include "gl/gles2_dec/GLESv2Decoder.h"
 #include "Handle.h"
diff --git a/stream-servers/RenderWindow.cpp b/stream-servers/RenderWindow.cpp
index cf972a58..65fedee2 100644
--- a/stream-servers/RenderWindow.cpp
+++ b/stream-servers/RenderWindow.cpp
@@ -14,8 +14,8 @@
 
 #include "RenderWindow.h"
 
-#include "base/Thread.h"
-#include "base/MessageChannel.h"
+#include "base/threads/Thread.h"
+#include "base/synchronization/MessageChannel.h"
 #include "host-common/logging.h"
 #include "FrameBuffer.h"
 #include "RendererImpl.h"
diff --git a/stream-servers/RenderWindow.h b/stream-servers/RenderWindow.h
index 18783e9a..4b91d69a 100644
--- a/stream-servers/RenderWindow.h
+++ b/stream-servers/RenderWindow.h
@@ -17,9 +17,9 @@
 
 #include "render_api.h"
 
-#include "base/MessageChannel.h"
-#include "base/FunctorThread.h"
-#include "base/Thread.h"
+#include "base/synchronization/MessageChannel.h"
+#include "base/threads/FunctorThread.h"
+#include "base/threads/Thread.h"
 
 class RenderWindowChannel;
 struct RenderWindowMessage;
diff --git a/stream-servers/RendererImpl.cpp b/stream-servers/RendererImpl.cpp
index 2ec747d4..df54f1c4 100644
--- a/stream-servers/RendererImpl.cpp
+++ b/stream-servers/RendererImpl.cpp
@@ -22,7 +22,7 @@
 #include "FrameBuffer.h"
 #include "RenderChannelImpl.h"
 #include "RenderThread.h"
-#include "base/System.h"
+#include "base/system/System.h"
 #include "host-common/logging.h"
 #include "snapshot/common.h"
 
diff --git a/stream-servers/RendererImpl.h b/stream-servers/RendererImpl.h
index 3fef2049..0ff26dc6 100644
--- a/stream-servers/RendererImpl.h
+++ b/stream-servers/RendererImpl.h
@@ -18,9 +18,9 @@
 #include "RenderWindow.h"
 
 #include "base/Compiler.h"
-#include "base/Lock.h"
-#include "base/MessageChannel.h"
-#include "base/FunctorThread.h"
+#include "base/synchronization/Lock.h"
+#include "base/synchronization/MessageChannel.h"
+#include "base/threads/FunctorThread.h"
 #include "snapshot/common.h"
 
 #include "RenderThread.h"
diff --git a/stream-servers/RingStream.cpp b/stream-servers/RingStream.cpp
index a43411df..8412a4da 100644
--- a/stream-servers/RingStream.cpp
+++ b/stream-servers/RingStream.cpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 #include "RingStream.h"
 
-#include "base/System.h"
+#include "base/system/System.h"
 
 #define EMUGL_DEBUG_LEVEL  0
 
diff --git a/stream-servers/StalePtrRegistry.h b/stream-servers/StalePtrRegistry.h
index bb533311..c965a398 100644
--- a/stream-servers/StalePtrRegistry.h
+++ b/stream-servers/StalePtrRegistry.h
@@ -15,10 +15,10 @@
 */
 #pragma once
 
-#include "base/Lookup.h"
-#include "base/Stream.h"
-#include "base/StreamSerializing.h"
-#include "base/Lock.h"
+#include "base/containers/Lookup.h"
+#include "base/files/Stream.h"
+#include "base/files/StreamSerializing.h"
+#include "base/synchronization/Lock.h"
 #include "base/Compiler.h"
 
 #include <algorithm>
diff --git a/stream-servers/SyncThread.cpp b/stream-servers/SyncThread.cpp
index 9b0897ac..86752a4d 100644
--- a/stream-servers/SyncThread.cpp
+++ b/stream-servers/SyncThread.cpp
@@ -18,8 +18,8 @@
 
 #include "OpenGLESDispatch/OpenGLDispatchLoader.h"
 #include "base/Metrics.h"
-#include "base/System.h"
-#include "base/Thread.h"
+#include "base/system/System.h"
+#include "base/threads/Thread.h"
 #include "host-common/GfxstreamFatalError.h"
 #include "host-common/crash_reporter.h"
 #include "host-common/logging.h"
diff --git a/stream-servers/SyncThread.h b/stream-servers/SyncThread.h
index 0cd21ac8..dcc53597 100644
--- a/stream-servers/SyncThread.h
+++ b/stream-servers/SyncThread.h
@@ -26,13 +26,13 @@
 #include <type_traits>
 
 #include "FenceSync.h"
-#include "base/ConditionVariable.h"
+#include "base/synchronization/ConditionVariable.h"
 #include "base/HealthMonitor.h"
-#include "base/Lock.h"
-#include "base/MessageChannel.h"
+#include "base/synchronization/Lock.h"
+#include "base/synchronization/MessageChannel.h"
 #include "base/Optional.h"
-#include "base/Thread.h"
-#include "base/ThreadPool.h"
+#include "base/threads/Thread.h"
+#include "base/threads/ThreadPool.h"
 #include "render-utils/virtio_gpu_ops.h"
 #include "vulkan/VkDecoderGlobalState.h"
 
diff --git a/stream-servers/VirtioGpuTimelines.h b/stream-servers/VirtioGpuTimelines.h
index 84f88942..916bc45f 100644
--- a/stream-servers/VirtioGpuTimelines.h
+++ b/stream-servers/VirtioGpuTimelines.h
@@ -23,7 +23,7 @@
 #include <unordered_map>
 #include <variant>
 
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 #include "virtio-gpu-gfxstream-renderer.h"
 #include "render-utils/virtio_gpu_ops.h"
 
diff --git a/stream-servers/apigen-codec-common/ChecksumCalculator.cpp b/stream-servers/apigen-codec-common/ChecksumCalculator.cpp
index 518f0f63..50853966 100644
--- a/stream-servers/apigen-codec-common/ChecksumCalculator.cpp
+++ b/stream-servers/apigen-codec-common/ChecksumCalculator.cpp
@@ -16,7 +16,7 @@
 
 #include "ChecksumCalculator.h"
 
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 
 #include <string>
 #include <vector>
diff --git a/stream-servers/gfxstream_unittest.cpp b/stream-servers/gfxstream_unittest.cpp
index 2882dae3..bc02c7f8 100644
--- a/stream-servers/gfxstream_unittest.cpp
+++ b/stream-servers/gfxstream_unittest.cpp
@@ -17,7 +17,7 @@
 #include "GfxStreamBackend.h"
 #include "host-common/testing/MockGraphicsAgentFactory.h"
 #include "OSWindow.h"
-#include "base/System.h"
+#include "base/system/System.h"
 
 class GfxStreamBackendTest : public ::testing::Test {
 private:
diff --git a/stream-servers/gl/GLESVersionDetector.cpp b/stream-servers/gl/GLESVersionDetector.cpp
index 8140570c..b15d0f6c 100644
--- a/stream-servers/gl/GLESVersionDetector.cpp
+++ b/stream-servers/gl/GLESVersionDetector.cpp
@@ -18,8 +18,8 @@
 
 #include "OpenGLESDispatch/EGLDispatch.h"
 
-#include "base/System.h"
-#include "base/StringUtils.h"
+#include "base/system/System.h"
+#include "base/misc/StringUtils.h"
 #include "host-common/feature_control.h"
 #include "host-common/misc.h"
 
diff --git a/stream-servers/gl/RenderContext.cpp b/stream-servers/gl/RenderContext.cpp
index 58ac1b18..ec3940bc 100644
--- a/stream-servers/gl/RenderContext.cpp
+++ b/stream-servers/gl/RenderContext.cpp
@@ -20,7 +20,7 @@
 #include "GLESVersionDetector.h"
 #include "OpenGLESDispatch/EGLDispatch.h"
 #include "OpenGLESDispatch/GLESv1Dispatch.h"
-#include "base/SmallVector.h"
+#include "base/containers/SmallVector.h"
 #include "host-common/feature_control.h"
 #include "host-common/logging.h"
 #include "host-common/misc.h"
diff --git a/stream-servers/gl/RenderContext.h b/stream-servers/gl/RenderContext.h
index 26759827..47300e7e 100644
--- a/stream-servers/gl/RenderContext.h
+++ b/stream-servers/gl/RenderContext.h
@@ -16,7 +16,7 @@
 #ifndef _LIBRENDER_RENDER_CONTEXT_H
 #define _LIBRENDER_RENDER_CONTEXT_H
 
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 #include "GLDecoderContextData.h"
 
 #include <EGL/egl.h>
diff --git a/stream-servers/gl/TextureDraw.h b/stream-servers/gl/TextureDraw.h
index f89667b0..28a62e8c 100644
--- a/stream-servers/gl/TextureDraw.h
+++ b/stream-servers/gl/TextureDraw.h
@@ -19,7 +19,7 @@
 #include <EGL/eglext.h>
 #include <GLES2/gl2.h>
 #include "Hwc2.h"
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 
 #include <vector>
 
diff --git a/stream-servers/gl/gles1_dec/GLESv1Decoder.cpp b/stream-servers/gl/gles1_dec/GLESv1Decoder.cpp
index 3d101fac..40e80889 100644
--- a/stream-servers/gl/gles1_dec/GLESv1Decoder.cpp
+++ b/stream-servers/gl/gles1_dec/GLESv1Decoder.cpp
@@ -15,7 +15,7 @@
 */
 #include "GLESv1Decoder.h"
 
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 
 #include "OpenGLESDispatch/GLESv1Dispatch.h"
 
diff --git a/stream-servers/gl/gles2_dec/GLESv2Decoder.cpp b/stream-servers/gl/gles2_dec/GLESv2Decoder.cpp
index 35a01cdd..49850764 100644
--- a/stream-servers/gl/gles2_dec/GLESv2Decoder.cpp
+++ b/stream-servers/gl/gles2_dec/GLESv2Decoder.cpp
@@ -17,7 +17,7 @@
 #include "GLESv2Decoder.h"
 #include "OpenGLESDispatch/GLESv2Dispatch.h"
 
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 
 #include "host-common/vm_operations.h"
 #include "host-common/dma_device.h"
diff --git a/stream-servers/gl/glestranslator/EGL/EglContext.h b/stream-servers/gl/glestranslator/EGL/EglContext.h
index 16325d25..983be28c 100644
--- a/stream-servers/gl/glestranslator/EGL/EglContext.h
+++ b/stream-servers/gl/glestranslator/EGL/EglContext.h
@@ -16,7 +16,7 @@
 #ifndef EGL_CONTEXT_H
 #define EGL_CONTEXT_H
 
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 
 #include "EglConfig.h"
 #include "EglOsApi.h"
diff --git a/stream-servers/gl/glestranslator/EGL/EglDisplay.cpp b/stream-servers/gl/glestranslator/EGL/EglDisplay.cpp
index 1a26e46e..3ffda652 100644
--- a/stream-servers/gl/glestranslator/EGL/EglDisplay.cpp
+++ b/stream-servers/gl/glestranslator/EGL/EglDisplay.cpp
@@ -15,8 +15,8 @@
 */
 #include "EglDisplay.h"
 
-#include "base/Lookup.h"
-#include "base/StreamSerializing.h"
+#include "base/containers/Lookup.h"
+#include "base/files/StreamSerializing.h"
 #include "EglConfig.h"
 #include "EglGlobalInfo.h"
 #include "EglOsApi.h"
diff --git a/stream-servers/gl/glestranslator/EGL/EglDisplay.h b/stream-servers/gl/glestranslator/EGL/EglDisplay.h
index 83227dad..d2c15ed5 100644
--- a/stream-servers/gl/glestranslator/EGL/EglDisplay.h
+++ b/stream-servers/gl/glestranslator/EGL/EglDisplay.h
@@ -19,8 +19,8 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
-#include "base/Lock.h"
-#include "base/Stream.h"
+#include "base/synchronization/Lock.h"
+#include "base/files/Stream.h"
 #include "EglConfig.h"
 #include "EglContext.h"
 #include "EglOsApi.h"
diff --git a/stream-servers/gl/glestranslator/EGL/EglGlobalInfo.h b/stream-servers/gl/glestranslator/EGL/EglGlobalInfo.h
index f6980f31..fba116d3 100644
--- a/stream-servers/gl/glestranslator/EGL/EglGlobalInfo.h
+++ b/stream-servers/gl/glestranslator/EGL/EglGlobalInfo.h
@@ -21,7 +21,7 @@
 #include "EglContext.h"
 #include "EglOsApi.h"
 
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 
 #include <GLcommon/TranslatorIfaces.h>
 
diff --git a/stream-servers/gl/glestranslator/EGL/EglImp.cpp b/stream-servers/gl/glestranslator/EGL/EglImp.cpp
index 859bf0b3..fa5d8ea5 100644
--- a/stream-servers/gl/glestranslator/EGL/EglImp.cpp
+++ b/stream-servers/gl/glestranslator/EGL/EglImp.cpp
@@ -26,9 +26,9 @@
 #include "GLcommon/TextureUtils.h"
 #include "GLcommon/TranslatorIfaces.h"
 #include "ThreadInfo.h"
-#include "base/Lock.h"
-#include "base/Stream.h"
-#include "base/System.h"
+#include "base/synchronization/Lock.h"
+#include "base/files/Stream.h"
+#include "base/system/System.h"
 #include "base/SharedLibrary.h"
 #include "host-common/GfxstreamFatalError.h"
 #include "host-common/logging.h"
diff --git a/stream-servers/gl/glestranslator/EGL/EglOsApi_darwin.cpp b/stream-servers/gl/glestranslator/EGL/EglOsApi_darwin.cpp
index a0fee5bd..acfd6b8a 100644
--- a/stream-servers/gl/glestranslator/EGL/EglOsApi_darwin.cpp
+++ b/stream-servers/gl/glestranslator/EGL/EglOsApi_darwin.cpp
@@ -17,7 +17,7 @@
 
 #include "MacNative.h"
 
-#include "base/Lookup.h"
+#include "base/containers/Lookup.h"
 #include "base/SharedLibrary.h"
 
 #include "host-common/logging.h"
diff --git a/stream-servers/gl/glestranslator/EGL/EglOsApi_egl.cpp b/stream-servers/gl/glestranslator/EGL/EglOsApi_egl.cpp
index 793cdbb6..d88d9922 100644
--- a/stream-servers/gl/glestranslator/EGL/EglOsApi_egl.cpp
+++ b/stream-servers/gl/glestranslator/EGL/EglOsApi_egl.cpp
@@ -16,7 +16,7 @@
 
 #include "EglOsApi.h"
 
-#include "base/System.h"
+#include "base/system/System.h"
 #include "base/SharedLibrary.h"
 #include "host-common/logging.h"
 #include "host-common/misc.h"
diff --git a/stream-servers/gl/glestranslator/EGL/EglOsApi_glx.cpp b/stream-servers/gl/glestranslator/EGL/EglOsApi_glx.cpp
index 5597048b..9be2f21c 100644
--- a/stream-servers/gl/glestranslator/EGL/EglOsApi_glx.cpp
+++ b/stream-servers/gl/glestranslator/EGL/EglOsApi_glx.cpp
@@ -15,7 +15,7 @@
 */
 #include "EglOsApi.h"
 
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 #include "base/SharedLibrary.h"
 #include "host-common/logging.h"
 
diff --git a/stream-servers/gl/glestranslator/EGL/EglOsApi_wgl.cpp b/stream-servers/gl/glestranslator/EGL/EglOsApi_wgl.cpp
index cd221689..8228b198 100755
--- a/stream-servers/gl/glestranslator/EGL/EglOsApi_wgl.cpp
+++ b/stream-servers/gl/glestranslator/EGL/EglOsApi_wgl.cpp
@@ -15,7 +15,7 @@
 */
 #include "EglOsApi.h"
 
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 #include "base/SharedLibrary.h"
 
 #include "CoreProfileConfigs.h"
diff --git a/stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngine.cpp b/stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngine.cpp
index a9bd128f..8083a15c 100644
--- a/stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngine.cpp
+++ b/stream-servers/gl/glestranslator/GLES_CM/CoreProfileEngine.cpp
@@ -21,7 +21,7 @@
 #include "GLcommon/GLESpointer.h"
 #include "GLEScmContext.h"
 
-#include "base/Lookup.h"
+#include "base/containers/Lookup.h"
 #include "host-common/crash_reporter.h"
 
 #include <glm/vec3.hpp>
diff --git a/stream-servers/gl/glestranslator/GLES_CM/GLEScmContext.cpp b/stream-servers/gl/glestranslator/GLES_CM/GLEScmContext.cpp
index 4b7cf068..259df757 100644
--- a/stream-servers/gl/glestranslator/GLES_CM/GLEScmContext.cpp
+++ b/stream-servers/gl/glestranslator/GLES_CM/GLEScmContext.cpp
@@ -23,8 +23,8 @@
 #include <GLES/gl.h>
 #include <GLES/glext.h>
 
-#include "base/Lock.h"
-#include "base/StreamSerializing.h"
+#include "base/synchronization/Lock.h"
+#include "base/files/StreamSerializing.h"
 #include "host-common/crash_reporter.h"
 #include "GLEScmValidate.h"
 
diff --git a/stream-servers/gl/glestranslator/GLES_V2/ANGLEShaderParser.cpp b/stream-servers/gl/glestranslator/GLES_V2/ANGLEShaderParser.cpp
index 04f40261..56a5e2d1 100644
--- a/stream-servers/gl/glestranslator/GLES_V2/ANGLEShaderParser.cpp
+++ b/stream-servers/gl/glestranslator/GLES_V2/ANGLEShaderParser.cpp
@@ -15,7 +15,7 @@
 #include "ANGLEShaderParser.h"
 #include "ShaderTranslator.h"
 
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 
 #include <map>
 #include <string>
diff --git a/stream-servers/gl/glestranslator/GLES_V2/GLESv2Context.cpp b/stream-servers/gl/glestranslator/GLES_V2/GLESv2Context.cpp
index 008bbd38..b5436122 100644
--- a/stream-servers/gl/glestranslator/GLES_V2/GLESv2Context.cpp
+++ b/stream-servers/gl/glestranslator/GLES_V2/GLESv2Context.cpp
@@ -20,8 +20,8 @@
 #include "SamplerData.h"
 #include "ShaderParser.h"
 #include "TransformFeedbackData.h"
-#include "base/Lock.h"
-#include "base/StreamSerializing.h"
+#include "base/synchronization/Lock.h"
+#include "base/files/StreamSerializing.h"
 
 #include "host-common/crash_reporter.h"
 
diff --git a/stream-servers/gl/glestranslator/GLES_V2/GLESv2Imp.cpp b/stream-servers/gl/glestranslator/GLES_V2/GLESv2Imp.cpp
index bdfba3a0..27e35680 100644
--- a/stream-servers/gl/glestranslator/GLES_V2/GLESv2Imp.cpp
+++ b/stream-servers/gl/glestranslator/GLES_V2/GLESv2Imp.cpp
@@ -26,7 +26,7 @@
 #include <GLES3/gl3.h>
 #include <GLES3/gl31.h>
 
-#include "base/System.h"
+#include "base/system/System.h"
 #include "host-common/logging.h"
 
 #include "GLESv2Context.h"
diff --git a/stream-servers/gl/glestranslator/GLES_V2/ProgramData.cpp b/stream-servers/gl/glestranslator/GLES_V2/ProgramData.cpp
index 3e2f8962..87946a65 100644
--- a/stream-servers/gl/glestranslator/GLES_V2/ProgramData.cpp
+++ b/stream-servers/gl/glestranslator/GLES_V2/ProgramData.cpp
@@ -17,8 +17,8 @@
 #include "ProgramData.h"
 #include "apigen-codec-common/glUtils.h"
 
-#include "base/Lookup.h"
-#include "base/StreamSerializing.h"
+#include "base/containers/Lookup.h"
+#include "base/files/StreamSerializing.h"
 #include "ANGLEShaderParser.h"
 #include "GLcommon/GLutils.h"
 #include "GLcommon/GLESmacros.h"
diff --git a/stream-servers/gl/glestranslator/GLES_V2/ProgramData.h b/stream-servers/gl/glestranslator/GLES_V2/ProgramData.h
index 3ff06e24..582ef015 100644
--- a/stream-servers/gl/glestranslator/GLES_V2/ProgramData.h
+++ b/stream-servers/gl/glestranslator/GLES_V2/ProgramData.h
@@ -18,7 +18,7 @@
 
 #include "ShaderParser.h"
 
-#include "base/HybridComponentManager.h"
+#include "base/containers/HybridComponentManager.h"
 
 #include <memory>
 #include <sstream>
diff --git a/stream-servers/gl/glestranslator/GLES_V2/SamplerData.cpp b/stream-servers/gl/glestranslator/GLES_V2/SamplerData.cpp
index 2b3646b7..4a030d55 100644
--- a/stream-servers/gl/glestranslator/GLES_V2/SamplerData.cpp
+++ b/stream-servers/gl/glestranslator/GLES_V2/SamplerData.cpp
@@ -16,7 +16,7 @@
 
 #include "SamplerData.h"
 
-#include "base/StreamSerializing.h"
+#include "base/files/StreamSerializing.h"
 #include "GLcommon/GLEScontext.h"
 
 SamplerData::SamplerData(android::base::Stream* stream)
diff --git a/stream-servers/gl/glestranslator/GLES_V2/ShaderParser.h b/stream-servers/gl/glestranslator/GLES_V2/ShaderParser.h
index 39bab564..4b9acdc6 100644
--- a/stream-servers/gl/glestranslator/GLES_V2/ShaderParser.h
+++ b/stream-servers/gl/glestranslator/GLES_V2/ShaderParser.h
@@ -17,7 +17,7 @@
 #ifndef SHADER_PARSER_H
 #define SHADER_PARSER_H
 
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 #include "ANGLEShaderParser.h"
 #include "GLESv2Context.h"
 #include <string>
diff --git a/stream-servers/gl/glestranslator/GLcommon/FramebufferData.cpp b/stream-servers/gl/glestranslator/GLcommon/FramebufferData.cpp
index c4bde27a..11808824 100644
--- a/stream-servers/gl/glestranslator/GLcommon/FramebufferData.cpp
+++ b/stream-servers/gl/glestranslator/GLcommon/FramebufferData.cpp
@@ -15,7 +15,7 @@
 */
 #include "GLcommon/FramebufferData.h"
 
-#include "base/StreamSerializing.h"
+#include "base/files/StreamSerializing.h"
 #include "GLcommon/GLEScontext.h"
 #include "GLcommon/GLutils.h"
 #include "GLcommon/TextureData.h"
diff --git a/stream-servers/gl/glestranslator/GLcommon/GLBackgroundLoader.cpp b/stream-servers/gl/glestranslator/GLcommon/GLBackgroundLoader.cpp
index c8132bb9..c29c84d2 100644
--- a/stream-servers/gl/glestranslator/GLcommon/GLBackgroundLoader.cpp
+++ b/stream-servers/gl/glestranslator/GLcommon/GLBackgroundLoader.cpp
@@ -18,7 +18,7 @@
 
 #include "GLcommon/GLEScontext.h"
 #include "GLcommon/SaveableTexture.h"
-#include "base/System.h"
+#include "base/system/System.h"
 
 #include <EGL/eglext.h>
 #include <GLES2/gl2.h>
diff --git a/stream-servers/gl/glestranslator/GLcommon/GLDispatch.cpp b/stream-servers/gl/glestranslator/GLcommon/GLDispatch.cpp
index ff4c7f4c..ca14db9e 100644
--- a/stream-servers/gl/glestranslator/GLcommon/GLDispatch.cpp
+++ b/stream-servers/gl/glestranslator/GLcommon/GLDispatch.cpp
@@ -17,7 +17,7 @@
 #include "GLcommon/GLDispatch.h"
 #include "GLcommon/GLLibrary.h"
 
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 #include "base/SharedLibrary.h"
 #include "host-common/logging.h"
 
diff --git a/stream-servers/gl/glestranslator/GLcommon/GLEScontext.cpp b/stream-servers/gl/glestranslator/GLcommon/GLEScontext.cpp
index a868707f..93d910b0 100644
--- a/stream-servers/gl/glestranslator/GLcommon/GLEScontext.cpp
+++ b/stream-servers/gl/glestranslator/GLcommon/GLEScontext.cpp
@@ -16,9 +16,9 @@
 
 #include <GLcommon/GLEScontext.h>
 
-#include "base/Lock.h"
-#include "base/Lookup.h"
-#include "base/StreamSerializing.h"
+#include "base/synchronization/Lock.h"
+#include "base/containers/Lookup.h"
+#include "base/files/StreamSerializing.h"
 #include "host-common/feature_control.h"
 #include "host-common/logging.h"
 
diff --git a/stream-servers/gl/glestranslator/GLcommon/GLutils.cpp b/stream-servers/gl/glestranslator/GLcommon/GLutils.cpp
index 299da671..01a6f3f4 100644
--- a/stream-servers/gl/glestranslator/GLcommon/GLutils.cpp
+++ b/stream-servers/gl/glestranslator/GLcommon/GLutils.cpp
@@ -15,7 +15,7 @@
 */
 #include <GLcommon/GLutils.h>
 
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 
 #include <GLES/gl.h>
 #include <GLES2/gl2.h>
diff --git a/stream-servers/gl/glestranslator/GLcommon/NamedObject.cpp b/stream-servers/gl/glestranslator/GLcommon/NamedObject.cpp
index 4e18eb0b..735408c8 100644
--- a/stream-servers/gl/glestranslator/GLcommon/NamedObject.cpp
+++ b/stream-servers/gl/glestranslator/GLcommon/NamedObject.cpp
@@ -20,7 +20,7 @@
 #include "GLcommon/ObjectNameSpace.h"
 
 #include "base/GLObjectCounter.h"
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 
 static constexpr int toIndex(NamedObjectType type) {
     return static_cast<int>(type);
diff --git a/stream-servers/gl/glestranslator/GLcommon/ObjectNameSpace.cpp b/stream-servers/gl/glestranslator/GLcommon/ObjectNameSpace.cpp
index 516820c6..c34e3e07 100644
--- a/stream-servers/gl/glestranslator/GLcommon/ObjectNameSpace.cpp
+++ b/stream-servers/gl/glestranslator/GLcommon/ObjectNameSpace.cpp
@@ -20,10 +20,10 @@
 
 #include "GLcommon/GLEScontext.h"
 #include "GLcommon/TranslatorIfaces.h"
-#include "base/Lock.h"
-#include "base/Lookup.h"
-#include "base/PathUtils.h"
-#include "base/StreamSerializing.h"
+#include "base/synchronization/Lock.h"
+#include "base/containers/Lookup.h"
+#include "base/files/PathUtils.h"
+#include "base/files/StreamSerializing.h"
 #include "host-common/crash_reporter.h"
 #include "host-common/logging.h"
 #include "snapshot/TextureLoader.h"
diff --git a/stream-servers/gl/glestranslator/GLcommon/SaveableTexture.cpp b/stream-servers/gl/glestranslator/GLcommon/SaveableTexture.cpp
index ae2aec6a..2ef546d3 100644
--- a/stream-servers/gl/glestranslator/GLcommon/SaveableTexture.cpp
+++ b/stream-servers/gl/glestranslator/GLcommon/SaveableTexture.cpp
@@ -17,9 +17,9 @@
 #include "GLcommon/SaveableTexture.h"
 
 #include "base/ArraySize.h"
-#include "base/SmallVector.h"
-#include "base/StreamSerializing.h"
-#include "base/System.h"
+#include "base/containers/SmallVector.h"
+#include "base/files/StreamSerializing.h"
+#include "base/system/System.h"
 
 #include "GLcommon/GLEScontext.h"
 #include "GLcommon/GLutils.h"
diff --git a/stream-servers/gl/glestranslator/GLcommon/ShareGroup.cpp b/stream-servers/gl/glestranslator/GLcommon/ShareGroup.cpp
index dcb572b8..e133a931 100644
--- a/stream-servers/gl/glestranslator/GLcommon/ShareGroup.cpp
+++ b/stream-servers/gl/glestranslator/GLcommon/ShareGroup.cpp
@@ -17,8 +17,8 @@
 #include <GLcommon/ObjectNameSpace.h>
 #include <GLcommon/GLEScontext.h>
 
-#include "base/Lock.h"
-#include "base/Lookup.h"
+#include "base/synchronization/Lock.h"
+#include "base/containers/Lookup.h"
 #include "GLcommon/FramebufferData.h"
 
 #include "host-common/logging.h"
diff --git a/stream-servers/gl/glestranslator/GLcommon/TextureData.cpp b/stream-servers/gl/glestranslator/GLcommon/TextureData.cpp
index d7d1ee6a..2918c244 100755
--- a/stream-servers/gl/glestranslator/GLcommon/TextureData.cpp
+++ b/stream-servers/gl/glestranslator/GLcommon/TextureData.cpp
@@ -16,8 +16,8 @@
 
 #include "GLcommon/TextureData.h"
 
-#include "base/Lookup.h"
-#include "base/StreamSerializing.h"
+#include "base/containers/Lookup.h"
+#include "base/files/StreamSerializing.h"
 
 #include "GLcommon/GLEScontext.h"
 #include "GLcommon/GLutils.h"
diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLBackgroundLoader.h b/stream-servers/gl/glestranslator/include/GLcommon/GLBackgroundLoader.h
index 63c4168e..25d5a333 100644
--- a/stream-servers/gl/glestranslator/include/GLcommon/GLBackgroundLoader.h
+++ b/stream-servers/gl/glestranslator/include/GLcommon/GLBackgroundLoader.h
@@ -15,7 +15,7 @@
 */
 #pragma once
 
-#include "base/Thread.h"
+#include "base/threads/Thread.h"
 #include "snapshot/TextureLoader.h"
 #include "GLcommon/TranslatorIfaces.h"
 
diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLDispatch.h b/stream-servers/gl/glestranslator/include/GLcommon/GLDispatch.h
index 1d591ea9..d6cf571d 100644
--- a/stream-servers/gl/glestranslator/include/GLcommon/GLDispatch.h
+++ b/stream-servers/gl/glestranslator/include/GLcommon/GLDispatch.h
@@ -20,7 +20,7 @@
 #include <GLES2/gl2.h>
 #include <GLES3/gl3.h>
 
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 #include "host-common/logging.h"
 
 #include "OpenGLESDispatch/gldefs.h"
diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLESbuffer.h b/stream-servers/gl/glestranslator/include/GLcommon/GLESbuffer.h
index d813e967..b256b7d7 100644
--- a/stream-servers/gl/glestranslator/include/GLcommon/GLESbuffer.h
+++ b/stream-servers/gl/glestranslator/include/GLcommon/GLESbuffer.h
@@ -16,7 +16,7 @@
 #ifndef GLES_BUFFER_H
 #define GLES_BUFFER_H
 
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 #include <stdio.h>
 #include <GLES/gl.h>
 #include <GLcommon/ObjectData.h>
diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLEScontext.h b/stream-servers/gl/glestranslator/include/GLcommon/GLEScontext.h
index d9c98eb5..21fb1d03 100644
--- a/stream-servers/gl/glestranslator/include/GLcommon/GLEScontext.h
+++ b/stream-servers/gl/glestranslator/include/GLcommon/GLEScontext.h
@@ -17,9 +17,9 @@
 #ifndef GLES_CONTEXT_H
 #define GLES_CONTEXT_H
 
-#include "base/Lookup.h"
-#include "base/Stream.h"
-#include "base/Lock.h"
+#include "base/containers/Lookup.h"
+#include "base/files/Stream.h"
+#include "base/synchronization/Lock.h"
 
 #include "GLDispatch.h"
 #include "GLESpointer.h"
diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLESmacros.h b/stream-servers/gl/glestranslator/include/GLcommon/GLESmacros.h
index 0f05e713..3a1b22ea 100644
--- a/stream-servers/gl/glestranslator/include/GLcommon/GLESmacros.h
+++ b/stream-servers/gl/glestranslator/include/GLcommon/GLESmacros.h
@@ -4,8 +4,8 @@
 #if defined(__linux__) || defined(__APPLE__)
 
 #include <mutex>
-#include "base/PathUtils.h"
-#include "base/MemoryTracker.h"
+#include "base/files/PathUtils.h"
+#include "base/memory/MemoryTracker.h"
 
 #if 0
 
diff --git a/stream-servers/gl/glestranslator/include/GLcommon/GLESpointer.h b/stream-servers/gl/glestranslator/include/GLcommon/GLESpointer.h
index 05ccc5f4..ba508c85 100644
--- a/stream-servers/gl/glestranslator/include/GLcommon/GLESpointer.h
+++ b/stream-servers/gl/glestranslator/include/GLcommon/GLESpointer.h
@@ -16,7 +16,7 @@
 #ifndef GLES_POINTER_H
 #define GLES_POINTER_H
 
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 #include <GLES/gl.h>
 #include "GLESbuffer.h"
 
diff --git a/stream-servers/gl/glestranslator/include/GLcommon/ObjectData.h b/stream-servers/gl/glestranslator/include/GLcommon/ObjectData.h
index 78237eac..47a77067 100644
--- a/stream-servers/gl/glestranslator/include/GLcommon/ObjectData.h
+++ b/stream-servers/gl/glestranslator/include/GLcommon/ObjectData.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 #include "GLcommon/NamedObject.h"
 
 #include <functional>
diff --git a/stream-servers/gl/glestranslator/include/GLcommon/ObjectNameSpace.h b/stream-servers/gl/glestranslator/include/GLcommon/ObjectNameSpace.h
index 0a9cdb65..0c933204 100644
--- a/stream-servers/gl/glestranslator/include/GLcommon/ObjectNameSpace.h
+++ b/stream-servers/gl/glestranslator/include/GLcommon/ObjectNameSpace.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "base/HybridComponentManager.h"
-#include "base/Lock.h"
+#include "base/containers/HybridComponentManager.h"
+#include "base/synchronization/Lock.h"
 #include "snapshot/common.h"
 #include "GLcommon/GLBackgroundLoader.h"
 #include "GLcommon/NamedObject.h"
diff --git a/stream-servers/gl/glestranslator/include/GLcommon/SaveableTexture.h b/stream-servers/gl/glestranslator/include/GLcommon/SaveableTexture.h
index fe3008af..69212a99 100644
--- a/stream-servers/gl/glestranslator/include/GLcommon/SaveableTexture.h
+++ b/stream-servers/gl/glestranslator/include/GLcommon/SaveableTexture.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include "base/SmallVector.h"
-#include "base/Stream.h"
+#include "base/containers/SmallVector.h"
+#include "base/files/Stream.h"
 #include "snapshot/LazySnapshotObj.h"
 #include "GLcommon/NamedObject.h"
 #include "GLcommon/TextureData.h"
diff --git a/stream-servers/gl/glestranslator/include/GLcommon/ShareGroup.h b/stream-servers/gl/glestranslator/include/GLcommon/ShareGroup.h
index 6da1d69b..df690472 100644
--- a/stream-servers/gl/glestranslator/include/GLcommon/ShareGroup.h
+++ b/stream-servers/gl/glestranslator/include/GLcommon/ShareGroup.h
@@ -16,8 +16,8 @@
 #ifndef _OBJECT_NAME_MANAGER_H
 #define _OBJECT_NAME_MANAGER_H
 
-#include "base/Lock.h"
-#include "base/Stream.h"
+#include "base/synchronization/Lock.h"
+#include "base/files/Stream.h"
 #include "GLcommon/NamedObject.h"
 #include "GLcommon/ObjectData.h"
 
diff --git a/stream-servers/gl/glestranslator/include/GLcommon/TextureData.h b/stream-servers/gl/glestranslator/include/GLcommon/TextureData.h
index 7b5c6e9a..79bbb976 100644
--- a/stream-servers/gl/glestranslator/include/GLcommon/TextureData.h
+++ b/stream-servers/gl/glestranslator/include/GLcommon/TextureData.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 
 #include "GLcommon/ObjectData.h"
 
diff --git a/stream-servers/gl/glestranslator/include/GLcommon/TranslatorIfaces.h b/stream-servers/gl/glestranslator/include/GLcommon/TranslatorIfaces.h
index 3b469b46..f72dc5ce 100644
--- a/stream-servers/gl/glestranslator/include/GLcommon/TranslatorIfaces.h
+++ b/stream-servers/gl/glestranslator/include/GLcommon/TranslatorIfaces.h
@@ -16,7 +16,7 @@
 #ifndef TRANSLATOR_IFACES_H
 #define TRANSLATOR_IFACES_H
 
-#include "base/SmallVector.h"
+#include "base/containers/SmallVector.h"
 #include "GLcommon/GLutils.h"
 #include "GLcommon/ShareGroup.h"
 
diff --git a/stream-servers/testlibs/x11/X11Window.cpp b/stream-servers/testlibs/x11/X11Window.cpp
index 2ebbd18a..5dab15f5 100644
--- a/stream-servers/testlibs/x11/X11Window.cpp
+++ b/stream-servers/testlibs/x11/X11Window.cpp
@@ -8,7 +8,7 @@
 
 #include "x11/X11Window.h"
 
-#include "base/System.h"
+#include "base/system/System.h"
 
 #include <assert.h>
 
diff --git a/stream-servers/tests/CompositorVk_unittest.cpp b/stream-servers/tests/CompositorVk_unittest.cpp
index cdf426f3..dd7e81f8 100644
--- a/stream-servers/tests/CompositorVk_unittest.cpp
+++ b/stream-servers/tests/CompositorVk_unittest.cpp
@@ -10,7 +10,7 @@
 #include <optional>
 
 #include "BorrowedImageVk.h"
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 #include "tests/ImageUtils.h"
 #include "tests/VkTestUtils.h"
 #include "vulkan/VulkanDispatch.h"
diff --git a/stream-servers/tests/DisplayVk_unittest.cpp b/stream-servers/tests/DisplayVk_unittest.cpp
index caf8b37a..91224e52 100644
--- a/stream-servers/tests/DisplayVk_unittest.cpp
+++ b/stream-servers/tests/DisplayVk_unittest.cpp
@@ -6,7 +6,7 @@
 
 #include "BorrowedImageVk.h"
 #include "Standalone.h"
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 #include "tests/VkTestUtils.h"
 #include "vulkan/VulkanDispatch.h"
 
diff --git a/stream-servers/tests/FrameBuffer_unittest.cpp b/stream-servers/tests/FrameBuffer_unittest.cpp
index e5211132..d0876182 100644
--- a/stream-servers/tests/FrameBuffer_unittest.cpp
+++ b/stream-servers/tests/FrameBuffer_unittest.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "base/PathUtils.h"
-#include "base/StdioStream.h"
+#include "base/files/PathUtils.h"
+#include "base/files/StdioStream.h"
 #include "base/GLObjectCounter.h"
-#include "base/System.h"
+#include "base/system/System.h"
 #include "base/testing/TestSystem.h"
 #include "host-common/GraphicsAgentFactory.h"
 #include "host-common/multi_display_agent.h"
diff --git a/stream-servers/tests/GLSnapshotTestDispatch.cpp b/stream-servers/tests/GLSnapshotTestDispatch.cpp
index 1b5ed284..b5fe7214 100644
--- a/stream-servers/tests/GLSnapshotTestDispatch.cpp
+++ b/stream-servers/tests/GLSnapshotTestDispatch.cpp
@@ -6,9 +6,9 @@
 #include "apigen-codec-common/glUtils.h"
 #include "RenderThreadInfo.h"
 
-#include "base/PathUtils.h"
-#include "base/StdioStream.h"
-#include "base/System.h"
+#include "base/files/PathUtils.h"
+#include "base/files/StdioStream.h"
+#include "base/system/System.h"
 #include "base/testing/TestSystem.h"
 #include "snapshot/TextureLoader.h"
 #include "snapshot/TextureSaver.h"
diff --git a/stream-servers/tests/GLSnapshotTesting.cpp b/stream-servers/tests/GLSnapshotTesting.cpp
index 9ff29a3f..264120fd 100644
--- a/stream-servers/tests/GLSnapshotTesting.cpp
+++ b/stream-servers/tests/GLSnapshotTesting.cpp
@@ -14,9 +14,9 @@
 
 #include "GLSnapshotTesting.h"
 
-#include "base/PathUtils.h"
-#include "base/StdioStream.h"
-#include "base/System.h"
+#include "base/files/PathUtils.h"
+#include "base/files/StdioStream.h"
+#include "base/system/System.h"
 #include "base/testing/TestSystem.h"
 #include "snapshot/TextureLoader.h"
 #include "snapshot/TextureSaver.h"
diff --git a/stream-servers/tests/GLSnapshotTesting.h b/stream-servers/tests/GLSnapshotTesting.h
index 2b1492b3..419c7e4d 100644
--- a/stream-servers/tests/GLSnapshotTesting.h
+++ b/stream-servers/tests/GLSnapshotTesting.h
@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "base/PathUtils.h"
-#include "base/System.h"
+#include "base/files/PathUtils.h"
+#include "base/system/System.h"
 #include "base/testing/TestSystem.h"
 
 #include "OpenGLTestContext.h"
diff --git a/stream-servers/tests/HelloTriangle.h b/stream-servers/tests/HelloTriangle.h
index 28a22ee6..eb41c5c0 100644
--- a/stream-servers/tests/HelloTriangle.h
+++ b/stream-servers/tests/HelloTriangle.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "base/System.h"
+#include "base/system/System.h"
 
 #include "Standalone.h"
 
diff --git a/stream-servers/tests/SampleApplication.cpp b/stream-servers/tests/SampleApplication.cpp
index 149ffd6e..b8847c4f 100644
--- a/stream-servers/tests/SampleApplication.cpp
+++ b/stream-servers/tests/SampleApplication.cpp
@@ -15,11 +15,11 @@
 #include "SampleApplication.h"
 
 #include "base/GLObjectCounter.h"
-#include "base/ConditionVariable.h"
-#include "base/Lock.h"
-#include "base/System.h"
+#include "base/synchronization/ConditionVariable.h"
+#include "base/synchronization/Lock.h"
+#include "base/system/System.h"
 #include "base/testing/TestSystem.h"
-#include "base/FunctorThread.h"
+#include "base/threads/FunctorThread.h"
 #include "host-common/GraphicsAgentFactory.h"
 #include "host-common/multi_display_agent.h"
 #include "host-common/MultiDisplay.h"
diff --git a/stream-servers/tests/ShaderUtils.cpp b/stream-servers/tests/ShaderUtils.cpp
index a320fb92..fde29e3b 100644
--- a/stream-servers/tests/ShaderUtils.cpp
+++ b/stream-servers/tests/ShaderUtils.cpp
@@ -14,9 +14,9 @@
 
 #include "ShaderUtils.h"
 
-#include "base/PathUtils.h"
+#include "base/files/PathUtils.h"
 #include "base/Optional.h"
-#include "base/System.h"
+#include "base/system/System.h"
 
 #include "OpenGLESDispatch/OpenGLDispatchLoader.h"
 
diff --git a/stream-servers/tests/Vulkan_unittest.cpp b/stream-servers/tests/Vulkan_unittest.cpp
index bb45ba4c..0e0f87d2 100644
--- a/stream-servers/tests/Vulkan_unittest.cpp
+++ b/stream-servers/tests/Vulkan_unittest.cpp
@@ -21,8 +21,8 @@
 
 #include "base/ArraySize.h"
 #include "base/GLObjectCounter.h"
-#include "base/PathUtils.h"
-#include "base/System.h"
+#include "base/files/PathUtils.h"
+#include "base/system/System.h"
 #include "base/testing/TestSystem.h"
 #include "host-common/GraphicsAgentFactory.h"
 #include "host-common/testing/MockGraphicsAgentFactory.h"
@@ -35,7 +35,7 @@
 
 #ifdef _WIN32
 #include <windows.h>
-#include "base/Win32UnicodeString.h"
+#include "base/system/Win32UnicodeString.h"
 using android::base::Win32UnicodeString;
 #else
 #include <dlfcn.h>
diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.cpp b/stream-servers/virtio-gpu-gfxstream-renderer.cpp
index d1a6ce97..2c0eca1e 100644
--- a/stream-servers/virtio-gpu-gfxstream-renderer.cpp
+++ b/stream-servers/virtio-gpu-gfxstream-renderer.cpp
@@ -19,8 +19,8 @@
 
 #include "VirtioGpuTimelines.h"
 #include "base/AlignedBuf.h"
-#include "base/Lock.h"
-#include "base/SharedMemory.h"
+#include "base/synchronization/Lock.h"
+#include "base/memory/SharedMemory.h"
 #include "base/ManagedDescriptor.hpp"
 #include "base/Tracing.h"
 #include "host-common/AddressSpaceService.h"
diff --git a/stream-servers/vulkan/CompositorVk.h b/stream-servers/vulkan/CompositorVk.h
index 72da5a8b..e68123b0 100644
--- a/stream-servers/vulkan/CompositorVk.h
+++ b/stream-servers/vulkan/CompositorVk.h
@@ -16,7 +16,7 @@
 #include "BorrowedImageVk.h"
 #include "Compositor.h"
 #include "Hwc2.h"
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 #include "base/LruCache.h"
 #include "vulkan/cereal/common/goldfish_vk_dispatch.h"
 #include "vulkan/vk_util.h"
diff --git a/stream-servers/vulkan/DisplayVk.h b/stream-servers/vulkan/DisplayVk.h
index 1c456b71..a91f5ecc 100644
--- a/stream-servers/vulkan/DisplayVk.h
+++ b/stream-servers/vulkan/DisplayVk.h
@@ -14,7 +14,7 @@
 #include "CompositorVk.h"
 #include "Hwc2.h"
 #include "SwapChainStateVk.h"
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 #include "vulkan/cereal/common/goldfish_vk_dispatch.h"
 
 // The DisplayVk class holds the Vulkan and other states required to draw a
diff --git a/stream-servers/vulkan/VkAndroidNativeBuffer.h b/stream-servers/vulkan/VkAndroidNativeBuffer.h
index 8ce6e8d5..1963e7a8 100644
--- a/stream-servers/vulkan/VkAndroidNativeBuffer.h
+++ b/stream-servers/vulkan/VkAndroidNativeBuffer.h
@@ -24,8 +24,8 @@
 #include "VkCommonOperations.h"
 #include "VkQsriTimeline.h"
 #include "base/BumpPool.h"
-#include "base/ConditionVariable.h"
-#include "base/Lock.h"
+#include "base/synchronization/ConditionVariable.h"
+#include "base/synchronization/Lock.h"
 #include "cereal/common/goldfish_vk_private_defs.h"
 
 namespace goldfish_vk {
diff --git a/stream-servers/vulkan/VkCommonOperations.cpp b/stream-servers/vulkan/VkCommonOperations.cpp
index 3e444a9e..3cd3bbfd 100644
--- a/stream-servers/vulkan/VkCommonOperations.cpp
+++ b/stream-servers/vulkan/VkCommonOperations.cpp
@@ -28,11 +28,11 @@
 #include "FrameBuffer.h"
 #include "VkFormatUtils.h"
 #include "VulkanDispatch.h"
-#include "base/Lock.h"
-#include "base/Lookup.h"
+#include "base/synchronization/Lock.h"
+#include "base/containers/Lookup.h"
 #include "base/Optional.h"
-#include "base/StaticMap.h"
-#include "base/System.h"
+#include "base/containers/StaticMap.h"
+#include "base/system/System.h"
 #include "base/Tracing.h"
 #include "common/goldfish_vk_dispatch.h"
 #include "host-common/GfxstreamFatalError.h"
diff --git a/stream-servers/vulkan/VkCommonOperations.h b/stream-servers/vulkan/VkCommonOperations.h
index 1b4d2a7f..77c7cfee 100644
--- a/stream-servers/vulkan/VkCommonOperations.h
+++ b/stream-servers/vulkan/VkCommonOperations.h
@@ -25,7 +25,7 @@
 #include "BorrowedImageVk.h"
 #include "CompositorVk.h"
 #include "DisplayVk.h"
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 #include "base/ManagedDescriptor.hpp"
 #include "base/Optional.h"
 #include "cereal/common/goldfish_vk_private_defs.h"
diff --git a/stream-servers/vulkan/VkDecoder.cpp b/stream-servers/vulkan/VkDecoder.cpp
index ba5b424b..296a3285 100644
--- a/stream-servers/vulkan/VkDecoder.cpp
+++ b/stream-servers/vulkan/VkDecoder.cpp
@@ -39,7 +39,7 @@
 #include "VulkanStream.h"
 #include "base/BumpPool.h"
 #include "base/Metrics.h"
-#include "base/System.h"
+#include "base/system/System.h"
 #include "base/Tracing.h"
 #include "common/goldfish_vk_marshaling.h"
 #include "common/goldfish_vk_private_defs.h"
diff --git a/stream-servers/vulkan/VkDecoderGlobalState.cpp b/stream-servers/vulkan/VkDecoderGlobalState.cpp
index 5b05d769..91671044 100644
--- a/stream-servers/vulkan/VkDecoderGlobalState.cpp
+++ b/stream-servers/vulkan/VkDecoderGlobalState.cpp
@@ -32,15 +32,15 @@
 #include "VulkanDispatch.h"
 #include "VulkanStream.h"
 #include "base/ArraySize.h"
-#include "base/ConditionVariable.h"
-#include "base/EntityManager.h"
-#include "base/HybridEntityManager.h"
-#include "base/Lock.h"
-#include "base/Lookup.h"
+#include "base/synchronization/ConditionVariable.h"
+#include "base/containers/EntityManager.h"
+#include "base/containers/HybridEntityManager.h"
+#include "base/synchronization/Lock.h"
+#include "base/containers/Lookup.h"
 #include "base/ManagedDescriptor.hpp"
 #include "base/Optional.h"
-#include "base/Stream.h"
-#include "base/System.h"
+#include "base/files/Stream.h"
+#include "base/system/System.h"
 #include "base/Tracing.h"
 #include "common/goldfish_vk_deepcopy.h"
 #include "common/goldfish_vk_dispatch.h"
diff --git a/stream-servers/vulkan/VkDecoderGlobalState.h b/stream-servers/vulkan/VkDecoderGlobalState.h
index c854763e..10ca4f84 100644
--- a/stream-servers/vulkan/VkDecoderGlobalState.h
+++ b/stream-servers/vulkan/VkDecoderGlobalState.h
@@ -27,7 +27,7 @@
 #include "base/AsyncResult.h"
 #include "base/GfxApiLogger.h"
 #include "base/HealthMonitor.h"
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 #include "cereal/common/goldfish_vk_private_defs.h"
 #include "cereal/common/goldfish_vk_transform.h"
 #include "host-common/GfxstreamFatalError.h"
diff --git a/stream-servers/vulkan/VkDecoderSnapshot.cpp b/stream-servers/vulkan/VkDecoderSnapshot.cpp
index 7bf49eec..baa1066a 100644
--- a/stream-servers/vulkan/VkDecoderSnapshot.cpp
+++ b/stream-servers/vulkan/VkDecoderSnapshot.cpp
@@ -32,7 +32,7 @@
 #include "VkDecoderGlobalState.h"
 #include "VkReconstruction.h"
 #include "VulkanHandleMapping.h"
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 
 using namespace goldfish_vk;
 using emugl::GfxApiLogger;
diff --git a/stream-servers/vulkan/VkReconstruction.cpp b/stream-servers/vulkan/VkReconstruction.cpp
index 718814ce..412d9b50 100644
--- a/stream-servers/vulkan/VkReconstruction.cpp
+++ b/stream-servers/vulkan/VkReconstruction.cpp
@@ -19,7 +19,7 @@
 
 #include "IOStream.h"
 #include "VkDecoder.h"
-#include "base/EntityManager.h"
+#include "base/containers/EntityManager.h"
 
 #define DEBUG_RECONSTRUCTION 0
 
diff --git a/stream-servers/vulkan/VkReconstruction.h b/stream-servers/vulkan/VkReconstruction.h
index 7369e841..a7d38186 100644
--- a/stream-servers/vulkan/VkReconstruction.h
+++ b/stream-servers/vulkan/VkReconstruction.h
@@ -15,10 +15,10 @@
 
 #include "VulkanHandleMapping.h"
 #include "VulkanHandles.h"
-#include "base/EntityManager.h"
+#include "base/containers/EntityManager.h"
 #include "base/GfxApiLogger.h"
 #include "base/HealthMonitor.h"
-#include "base/Stream.h"
+#include "base/files/Stream.h"
 #include "common/goldfish_vk_marshaling.h"
 
 // A class that captures all important data structures for
diff --git a/stream-servers/vulkan/VulkanDispatch.cpp b/stream-servers/vulkan/VulkanDispatch.cpp
index 66bae960..59e039dd 100644
--- a/stream-servers/vulkan/VulkanDispatch.cpp
+++ b/stream-servers/vulkan/VulkanDispatch.cpp
@@ -14,10 +14,10 @@
 
 #include "VulkanDispatch.h"
 
-#include "base/Lock.h"
-#include "base/PathUtils.h"
+#include "base/synchronization/Lock.h"
+#include "base/files/PathUtils.h"
 #include "base/SharedLibrary.h"
-#include "base/System.h"
+#include "base/system/System.h"
 #include "host-common/misc.h"
 
 using android::base::AutoLock;
diff --git a/stream-servers/vulkan/VulkanStream.h b/stream-servers/vulkan/VulkanStream.h
index 4442dfc2..20281653 100644
--- a/stream-servers/vulkan/VulkanStream.h
+++ b/stream-servers/vulkan/VulkanStream.h
@@ -20,8 +20,8 @@
 
 #include "VulkanHandleMapping.h"
 #include "base/BumpPool.h"
-#include "base/Stream.h"
-#include "base/StreamSerializing.h"
+#include "base/files/Stream.h"
+#include "base/files/StreamSerializing.h"
 #include "common/goldfish_vk_private_defs.h"
 
 #define E(fmt, ...) fprintf(stderr, fmt "\n", ##__VA_ARGS__)
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.h b/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.h
index 86bc0ca9..f2fccab9 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.h
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_marshaling.h
@@ -30,7 +30,7 @@
 #include <vulkan/vulkan.h>
 
 #include "VulkanStream.h"
-#include "base/StreamSerializing.h"
+#include "base/files/StreamSerializing.h"
 #include "goldfish_vk_private_defs.h"
 #include "vk_android_native_buffer.h"
 #include "vulkan_gfxstream.h"
diff --git a/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.h b/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.h
index ee177645..4a288c57 100644
--- a/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.h
+++ b/stream-servers/vulkan/cereal/common/goldfish_vk_reserved_marshaling.h
@@ -30,7 +30,7 @@
 #include <vulkan/vulkan.h>
 
 #include "VulkanStream.h"
-#include "base/StreamSerializing.h"
+#include "base/files/StreamSerializing.h"
 #include "goldfish_vk_private_defs.h"
 #include "vk_android_native_buffer.h"
 #include "vulkan_gfxstream.h"
diff --git a/stream-servers/vulkan/vk_util.h b/stream-servers/vulkan/vk_util.h
index f8968272..f07664f5 100644
--- a/stream-servers/vulkan/vk_util.h
+++ b/stream-servers/vulkan/vk_util.h
@@ -41,7 +41,7 @@
 #include <vector>
 
 #include "VulkanDispatch.h"
-#include "base/Lock.h"
+#include "base/synchronization/Lock.h"
 #include "common/vk_struct_id.h"
 #include "host-common/GfxstreamFatalError.h"
 #include "host-common/logging.h"