diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index c1068c622..2f9336c21 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -3,7 +3,10 @@
 
 set(BUILD_SHARED_LIBS OFF)
 set(BUILD_TESTING OFF)
-set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL ON)
+set_directory_properties(PROPERTIES
+    EXCLUDE_FROM_ALL ON
+    SYSTEM ON
+)
 
 if (MSVC)
     # Silence "deprecation" warnings
@@ -74,7 +77,7 @@ endif()
 # RenderDoc
 if (NOT TARGET RenderDoc::API)
     add_library(renderdoc INTERFACE)
-    target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc)
+    target_include_directories(renderdoc INTERFACE ./renderdoc)
     add_library(RenderDoc::API ALIAS renderdoc)
 endif()
 
@@ -187,4 +190,4 @@ add_subdirectory(discord-rpc/)
 target_include_directories(discord-rpc INTERFACE discord-rpc/include)
 
 # GCN Headers
-add_subdirectory(gcn)
\ No newline at end of file
+add_subdirectory(gcn)
diff --git a/src/imgui/imgui_config.h b/src/imgui/imgui_config.h
index 2094d56bc..66d2b25c1 100644
--- a/src/imgui/imgui_config.h
+++ b/src/imgui/imgui_config.h
@@ -29,4 +29,4 @@ extern void assert_fail_debug_msg(const char* msg);
     constexpr ImVec2(float _v) : x(_v), y(_v) {}
 
 #define IM_VEC4_CLASS_EXTRA                                                                        \
-    constexpr ImVec4(float _v) : x(_v), y(_v), z(_v), w(_v) {}
\ No newline at end of file
+    constexpr ImVec4(float _v) : x(_v), y(_v), z(_v), w(_v) {}
diff --git a/src/video_core/renderer_vulkan/vk_instance.cpp b/src/video_core/renderer_vulkan/vk_instance.cpp
index 7a1d784fa..3513f60d2 100644
--- a/src/video_core/renderer_vulkan/vk_instance.cpp
+++ b/src/video_core/renderer_vulkan/vk_instance.cpp
@@ -265,7 +265,9 @@ bool Instance::CreateDevice() {
 
     // These extensions are promoted by Vulkan 1.3, but for greater compatibility we use Vulkan 1.2
     // with extensions.
-    tooling_info = add_extension(VK_EXT_TOOLING_INFO_EXTENSION_NAME);
+    if (Config ::vkValidationEnabled() || Config::isRdocEnabled()) {
+        tooling_info = add_extension(VK_EXT_TOOLING_INFO_EXTENSION_NAME);
+    }
     const bool maintenance4 = add_extension(VK_KHR_MAINTENANCE_4_EXTENSION_NAME);
     add_extension(VK_KHR_FORMAT_FEATURE_FLAGS_2_EXTENSION_NAME);
     add_extension(VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME);