diff --git a/ultramodern/CMakeLists.txt b/ultramodern/CMakeLists.txt
index ded4d93..9dfea09 100644
--- a/ultramodern/CMakeLists.txt
+++ b/ultramodern/CMakeLists.txt
@@ -2,17 +2,29 @@ cmake_minimum_required(VERSION 3.20)
 project(ultramodern)
 
 add_library(ultramodern STATIC
-        "${CMAKE_CURRENT_SOURCE_DIR}/src/audio.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/src/events.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/src/mesgqueue.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/src/misc_ultra.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/src/rt64_layer.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/src/scheduling.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/src/task_win32.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/src/threadqueue.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/src/threads.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/src/timer.cpp")
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/audio.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/events.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/mesgqueue.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/misc_ultra.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/rt64_layer.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/scheduling.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/task_win32.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/threadqueue.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/threads.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/timer.cpp"
+)
 
 target_include_directories(ultramodern PUBLIC
-        "${CMAKE_CURRENT_SOURCE_DIR}/include"
-        "${CMAKE_SOURCE_DIR}/thirdparty/concurrentqueue")
+    "${CMAKE_CURRENT_SOURCE_DIR}/include/ultramodern"
+    "${CMAKE_SOURCE_DIR}/thirdparty/concurrentqueue"
+)
+
+target_include_directories(ultramodern PRIVATE
+    "${CMAKE_SOURCE_DIR}/rt64/src"
+    "${CMAKE_SOURCE_DIR}/rt64/src/contrib"
+    "${CMAKE_SOURCE_DIR}/rt64/src/contrib/hlslpp/include"
+    "${CMAKE_SOURCE_DIR}/rt64/src/contrib/dxc/inc"
+    "${CMAKE_SOURCE_DIR}/rt64/src/rhi"
+    "${CMAKE_SOURCE_DIR}/rt64/src/render"
+    "${CMAKE_SOURCE_DIR}/rt64/src/contrib/nativefiledialog-extended/src/include"
+)