diff --git a/renderdoc/driver/ihv/nv/CMakeLists.txt b/renderdoc/driver/ihv/nv/CMakeLists.txt
index 6d0a49e95..08ce21c37 100644
--- a/renderdoc/driver/ihv/nv/CMakeLists.txt
+++ b/renderdoc/driver/ihv/nv/CMakeLists.txt
@@ -2,7 +2,9 @@ set(sources
     nv_counter_enumerator.cpp
     nv_counter_enumerator.h
     nv_gl_counters.h
-    nv_vk_counters.h)
+    nv_vk_counters.h
+    nv_aftermath.h
+    nv_aftermath.cpp)
 
 if(ENABLE_GL OR ENABLE_GLES)
     set(sources_gl nv_gl_counters.cpp)
diff --git a/renderdoc/driver/ihv/nv/nv_aftermath.cpp b/renderdoc/driver/ihv/nv/nv_aftermath.cpp
index 3cb09a4db..ddaeef83b 100644
--- a/renderdoc/driver/ihv/nv/nv_aftermath.cpp
+++ b/renderdoc/driver/ihv/nv/nv_aftermath.cpp
@@ -24,7 +24,6 @@
 
 #include "nv_aftermath.h"
 
-#include <windows.h>
 #include <unordered_map>
 #include "common/formatting.h"
 #include "common/threading.h"
@@ -37,19 +36,21 @@ RDOC_CONFIG(bool, Replay_Debug_EnableAftermath, false,
 RDOC_CONFIG(bool, Replay_Debug_EnableNVRTValidation, false,
             "Enable nvidia Raytracing validation on D3D12 and Vulkan.");
 
-#include "driver/dx/official/d3d12.h"
-#include "driver/dx/official/dxgi.h"
-#include "driver/vulkan/official/vulkan_core.h"
-
 #include "driver/ihv/nv/official/aftermath/GFSDK_Aftermath.h"
 #include "driver/ihv/nv/official/aftermath/GFSDK_Aftermath_GpuCrashDump.h"
 #include "driver/ihv/nv/official/aftermath/GFSDK_Aftermath_GpuCrashDumpDecoding.h"
 
-#include "official/nvapi/nvapi.h"
-
 // assume this macro is only available if we got the real headers
 #if defined(GFSDK_AFTERMATH_CALL)
 
+#include "official/nvapi/nvapi.h"
+
+#include <windows.h>
+
+#include "driver/dx/official/d3d12.h"
+#include "driver/dx/official/dxgi.h"
+#include "driver/vulkan/official/vulkan_core.h"
+
 namespace
 {
 #include "official/nvapi/nvapi_interface.h"