diff --git a/CMakeLists.txt b/CMakeLists.txt
index 541570d..a903e19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -705,7 +705,7 @@
     # TODO: Create src/Base and make this a lib target, and move stuff from
     # src/Vulkan into it that is needed by vk_pipeline, vk_device, and vk_wsi.
     add_library(vk_base INTERFACE)
-    
+
     if(SWIFTSHADER_ENABLE_VULKAN_DEBUGGER)
         target_compile_definitions(vk_base INTERFACE "ENABLE_VK_DEBUGGER")
     endif()
diff --git a/src/Vulkan/CMakeLists.txt b/src/Vulkan/CMakeLists.txt
index 8faa997..bc334b0 100644
--- a/src/Vulkan/CMakeLists.txt
+++ b/src/Vulkan/CMakeLists.txt
@@ -98,24 +98,24 @@
 
 if(SWIFTSHADER_ENABLE_VULKAN_DEBUGGER)
     list(APPEND VULKAN_SRC_FILES
-        Context.cpp
-        Context.hpp
-        Debug.cpp
-        EventListener.hpp
-        File.cpp
-        File.hpp
-        ID.hpp
-        Location.hpp
-        Server.cpp
-        Server.hpp
-        Thread.cpp
-        Thread.hpp
-        Type.cpp
-        Type.hpp
-        Value.cpp
-        Value.hpp
-        Variable.hpp
-        WeakMap.hpp
+        Debug/Context.cpp
+        Debug/Context.hpp
+        Debug/Debug.cpp
+        Debug/EventListener.hpp
+        Debug/File.cpp
+        Debug/File.hpp
+        Debug/ID.hpp
+        Debug/Location.hpp
+        Debug/Server.cpp
+        Debug/Server.hpp
+        Debug/Thread.cpp
+        Debug/Thread.hpp
+        Debug/Type.cpp
+        Debug/Type.hpp
+        Debug/Value.cpp
+        Debug/Value.hpp
+        Debug/Variable.hpp
+        Debug/WeakMap.hpp
     )
 endif()