diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad00e2f34..d932ea9ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,7 @@ project(rpcsx)
 
 set(CMAKE_CXX_EXTENSIONS off)
 set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_subdirectory(3rdparty/crypto)
 add_subdirectory(orbis-kernel)
diff --git a/orbis-kernel/CMakeLists.txt b/orbis-kernel/CMakeLists.txt
index aecc11b24..979f67f31 100644
--- a/orbis-kernel/CMakeLists.txt
+++ b/orbis-kernel/CMakeLists.txt
@@ -68,11 +68,11 @@ add_library(obj.orbis-kernel OBJECT
 target_link_libraries(obj.orbis-kernel PUBLIC orbis::kernel::config)
 
 target_include_directories(obj.orbis-kernel
-PUBLIC
-  include
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
 
-PRIVATE
-  include/orbis
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/orbis
 )
 
 add_library(orbis-kernel STATIC)
diff --git a/rpcsx-gpu/CMakeLists.txt b/rpcsx-gpu/CMakeLists.txt
index 0232a5a7e..d33fe9aee 100644
--- a/rpcsx-gpu/CMakeLists.txt
+++ b/rpcsx-gpu/CMakeLists.txt
@@ -1,9 +1,11 @@
+find_package(Vulkan 1.3 REQUIRED)
+find_package(glfw3 3.3 REQUIRED)
 
 add_executable(rpcsx-gpu
   main.cpp
 )
 
-target_include_directories(rpcsx-gpu PUBLIC .)
-target_link_libraries(rpcsx-gpu PUBLIC amdgpu::bridge amdgpu::device glfw vulkan)
+target_include_directories(rpcsx-gpu PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(rpcsx-gpu PUBLIC amdgpu::bridge amdgpu::device glfw Vulkan::Vulkan)
 set_target_properties(rpcsx-gpu PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 install(TARGETS rpcsx-gpu RUNTIME DESTINATION bin)
diff --git a/rpcsx-os/CMakeLists.txt b/rpcsx-os/CMakeLists.txt
index 6feb23646..6da387192 100644
--- a/rpcsx-os/CMakeLists.txt
+++ b/rpcsx-os/CMakeLists.txt
@@ -28,7 +28,8 @@ add_executable(rpcsx-os
   thread.cpp
   vfs.cpp
 )
-target_include_directories(rpcsx-os PUBLIC .)
+
+target_include_directories(rpcsx-os PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(rpcsx-os PUBLIC orbis::kernel amdgpu::bridge libcrypto unwind unwind-x86_64)
 target_link_options(rpcsx-os PUBLIC "LINKER:-Ttext-segment,0x0000010000000000")
 target_compile_options(rpcsx-os PRIVATE "-march=native")