diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 4e60988c..5f7c28b7 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -28,9 +28,12 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND MSVC)
     target_include_directories(cryptoppwin INTERFACE cryptoppwin/include)
 else()
     # CryptoPP
+    set(CRYPTOPP_INSTALL OFF)
     set(CRYPTOPP_BUILD_TESTING OFF)
     set(CRYPTOPP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/)
     add_subdirectory(cryptopp-cmake EXCLUDE_FROM_ALL)
+    file(COPY cryptopp DESTINATION cryptopp FILES_MATCHING PATTERN "*.h")
+    target_include_directories(cryptopp INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/cryptopp")
 endif()
 
 # Zlib-Ng
@@ -60,6 +63,8 @@ set(ENABLE_HLSL OFF CACHE BOOL "")
 set(BUILD_EXTERNAL OFF CACHE BOOL "")
 set(ENABLE_OPT OFF CACHE BOOL "")
 add_subdirectory(glslang)
+file(COPY glslang/SPIRV DESTINATION glslang/glslang FILES_MATCHING PATTERN "*.h")
+target_include_directories(SPIRV INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/glslang")
 
 # Robin-map
 add_subdirectory(robin-map EXCLUDE_FROM_ALL)
diff --git a/externals/cryptoppwin b/externals/cryptoppwin
index 0dd224c6..bc3441dd 160000
--- a/externals/cryptoppwin
+++ b/externals/cryptoppwin
@@ -1 +1 @@
-Subproject commit 0dd224c6812cd038e9f4691d2f869dd57b547ff1
+Subproject commit bc3441dd2d6a9728e747dc0180bc8b9065a2923c
diff --git a/src/core/crypto/crypto.h b/src/core/crypto/crypto.h
index 2f926054..0c5bc995 100644
--- a/src/core/crypto/crypto.h
+++ b/src/core/crypto/crypto.h
@@ -4,13 +4,13 @@
 #pragma once
 
 #include <span>
-#include <aes.h>
-#include <filters.h>
-#include <modes.h>
-#include <oaep.h>
-#include <osrng.h>
-#include <rsa.h>
-#include <sha.h>
+#include <cryptopp/aes.h>
+#include <cryptopp/filters.h>
+#include <cryptopp/modes.h>
+#include <cryptopp/oaep.h>
+#include <cryptopp/osrng.h>
+#include <cryptopp/rsa.h>
+#include <cryptopp/sha.h>
 
 #include "common/types.h"
 #include "keys.h"
diff --git a/src/core/crypto/keys.h b/src/core/crypto/keys.h
index 1c7ddfba..37b66bd0 100644
--- a/src/core/crypto/keys.h
+++ b/src/core/crypto/keys.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
-#include <rsa.h>
+#include <cryptopp/rsa.h>
 
 class FakeKeyset {
 public:
diff --git a/src/video_core/renderer_vulkan/vk_shader_util.cpp b/src/video_core/renderer_vulkan/vk_shader_util.cpp
index 699fa15a..68776011 100644
--- a/src/video_core/renderer_vulkan/vk_shader_util.cpp
+++ b/src/video_core/renderer_vulkan/vk_shader_util.cpp
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <memory>
-#include <SPIRV/GlslangToSpv.h>
 #include <glslang/Include/ResourceLimits.h>
 #include <glslang/Public/ShaderLang.h>
+#include <glslang/SPIRV/GlslangToSpv.h>
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "video_core/renderer_vulkan/vk_shader_util.h"