From 27c9ccaf56e6319bcf085f45e51a6682e7d5e354 Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Tue, 13 Jul 2021 13:07:12 -0700
Subject: [PATCH] Atom/RHI/DX12

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
---
 .../Platform/Windows/RHI/Conversions_Windows.cpp      |  1 -
 .../Code/Source/Platform/Windows/RHI/DX12_Windows.cpp |  1 -
 .../Source/Platform/Windows/RHI/Device_Windows.cpp    |  3 ++-
 .../RHI/NsightAftermathGpuCrashTracker_Windows.cpp    |  1 -
 .../Platform/Windows/RHI/NsightAftermath_Windows.cpp  |  1 -
 .../Platform/Windows/RHI/PhysicalDevice_Windows.cpp   |  1 -
 .../Platform/Windows/RHI/PhysicalDevice_Windows.h     |  1 +
 .../Source/Platform/Windows/RHI/SwapChain_Windows.cpp |  1 -
 .../Platform/Windows/RHI/SystemComponent_Windows.cpp  |  3 ++-
 .../Platform/Windows/RHI/WindowsVersionQuery.cpp      |  3 ++-
 .../Source/Platform/Windows/RHI/WindowsVersionQuery.h |  2 ++
 Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp    |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.h      |  1 +
 .../DX12/Code/Source/RHI/AliasingBarrierTracker.cpp   |  1 -
 .../RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp     |  1 -
 .../DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h  | 11 -----------
 Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.cpp         |  1 -
 .../DX12/Code/Source/RHI/BufferMemoryAllocator.cpp    |  1 -
 .../RHI/DX12/Code/Source/RHI/BufferMemoryView.cpp     |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp     |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.cpp     |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp    |  1 -
 .../Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h  |  1 +
 .../Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.h  |  1 +
 Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.cpp   |  1 -
 .../RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp  |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.cpp    |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.h      |  1 +
 Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.cpp           |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.cpp     |  1 -
 .../RHI/DX12/Code/Source/RHI/DescriptorContext.cpp    |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.cpp |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp         |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.cpp          |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.h            |  1 +
 .../RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp   |  1 -
 .../RHI/DX12/Code/Source/RHI/FrameGraphCompiler.h     |  1 +
 .../DX12/Code/Source/RHI/FrameGraphExecuteGroup.cpp   |  1 -
 .../Code/Source/RHI/FrameGraphExecuteGroupBase.cpp    |  1 -
 .../Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp  |  1 -
 .../RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp   |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/Image.cpp          |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp      |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.cpp      |  1 -
 .../DX12/Code/Source/RHI/IndirectBufferSignature.cpp  |  1 -
 .../DX12/Code/Source/RHI/IndirectBufferSignature.h    |  1 +
 .../RHI/DX12/Code/Source/RHI/IndirectBufferWriter.cpp |  1 -
 .../RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp  |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp     |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/Module.cpp         |  3 ++-
 Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.h   |  1 +
 .../Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.cpp |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp  |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/Query.cpp          |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.cpp      |  1 -
 .../RHI/DX12/Code/Source/RHI/QueryPoolResolver.cpp    |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.h   |  1 +
 .../DX12/Code/Source/RHI/RayTracingPipelineState.cpp  |  1 -
 .../DX12/Code/Source/RHI/RayTracingPipelineState.h    |  1 +
 .../DX12/Code/Source/RHI/RayTracingShaderTable.cpp    |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.h   |  1 +
 Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.cpp        |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp          |  1 -
 .../RHI/DX12/Code/Source/RHI/ShaderResourceGroup.cpp  |  1 -
 .../DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp  |  1 -
 .../DX12/Code/Source/RHI/StagingMemoryAllocator.cpp   |  1 -
 .../RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp   |  2 --
 Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.cpp      |  1 -
 Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.h        |  1 +
 .../Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp |  2 +-
 .../DX12/Code/Source/RHI/TransientAttachmentPool.cpp  |  1 -
 .../Code/atom_rhi_dx12_private_common_files.cmake     |  1 -
 77 files changed, 24 insertions(+), 74 deletions(-)
 delete mode 100644 Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h

diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.cpp
index 0748b1707e..a148c935a0 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/Conversions.h>
 
 namespace AZ
diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.cpp
index 9372b32ea1..61a4a24674 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/Conversions.h>
 #include <RHI/CommandQueue.h>
 
diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.cpp
index 07ba90336f..6509fdf6a1 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.cpp
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
+
+#include <AzCore/PlatformIncl.h>
 #include <RHI/Device.h>
 #include <RHI/CommandQueueContext.h>
 #include <RHI/NsightAftermath.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp
index 5d80372c10..bb2037333e 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/NsightAftermathGpuCrashTracker_Windows.h>
 #include <AzCore/Settings/SettingsRegistry.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp
index 5b9341d972..b5e32538c1 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/NsightAftermathGpuCrashTracker_Windows.h>
 
 
diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.cpp
index 111920594e..f78510eb99 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/PhysicalDevice_Windows.h>
 #include <AzCore/std/string/conversions.h>
 
diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.h b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.h
index c0916a84ee..9a54e44338 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <Atom/RHI/PhysicalDevice.h>
+#include <RHI/DX12.h>
 
 namespace AZ
 {
diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SwapChain_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SwapChain_Windows.cpp
index 10678bafaa..86c8fa5cc3 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SwapChain_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SwapChain_Windows.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/SwapChain.h>
 #include <RHI/Device.h>
 #include <RHI/Conversions.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SystemComponent_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SystemComponent_Windows.cpp
index 6e8657c1ca..4a41a21ece 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SystemComponent_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SystemComponent_Windows.cpp
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
+
+#include <AzCore/PlatformIncl.h>
 #include <RHI/SystemComponent.h>
 #include <RHI/WindowsVersionQuery.h>
 
diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.cpp
index ce5a25540f..d716279a0b 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.cpp
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
+
 #include <RHI/WindowsVersionQuery.h>
+#include <AzCore/std/containers/vector.h>
 
 namespace AZ
 {
diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.h b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.h
index fc3773c4de..323d5b4419 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.h
@@ -6,6 +6,8 @@
  */
 #pragma once
 
+#include <AzCore/PlatformIncl.h>
+
 namespace AZ
 {
     namespace DX12
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp
index f77bf7a2d0..7dd3321fd7 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/AliasedHeap.h>
 #include <RHI/AliasingBarrierTracker.h>
 #include <RHI/Image.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.h
index 401d0675e9..a14fe0eba9 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.h
@@ -8,6 +8,7 @@
 
 #include <Atom/RHI/AliasedHeap.h>
 #include <AzCore/Memory/SystemAllocator.h>
+#include <RHI/DX12.h>
 
 namespace AZ
 {
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.cpp
index 1e63f15224..536891d4a8 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/AliasingBarrierTracker.h>
 #include <RHI/Image.h>
 #include <RHI/Buffer.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp
index 4fd8e06c32..84dfce65ce 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <Atom/RHI/RHISystemInterface.h>
 #include <Atom/RHI.Reflect/PlatformLimitsDescriptor.h>
 #include <RHI/AsyncUploadQueue.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
deleted file mode 100644
index a032f59091..0000000000
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
- * 
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#include <AzCore/PlatformIncl.h>
-#include <RHI/DX12.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.cpp
index e1d48d91a6..f8b8c6ff77 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/Buffer.h>
 #include <Atom/RHI/MemoryStatisticsBuilder.h>
 
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp
index 6ee2226867..e2858a922a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/BufferMemoryAllocator.h>
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.cpp
index 6365b77186..5b67f3e587 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/BufferMemoryView.h>
 
 namespace AZ
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp
index bd13573c28..878d966616 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <Atom/RHI/RHISystemInterface.h>
 #include <Atom/RHI.Reflect/PlatformLimitsDescriptor.h>
 #include <RHI/BufferPool.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.cpp
index eb63acd23a..8004b02f5e 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/BufferView.h>
 #include <RHI/Buffer.h>
 #include <RHI/Conversions.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp
index 83ef4176b2..813fe2c66d 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/CommandList.h>
 #include <RHI/Conversions.h>
 #include <RHI/Buffer.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp
index 60c4707576..d46c9c59df 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/CommandListBase.h>
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h
index 18ba901c5a..109f5a7844 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h
@@ -10,6 +10,7 @@
 #include <Atom/RHI.Reflect/AttachmentEnums.h>
 #include <AzCore/std/containers/vector.h>
 #include <AzCore/std/containers/unordered_map.h>
+#include <RHI/DX12.h>
 
 namespace AZ
 {
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp
index 7c55207a24..65f11dbdaa 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/CommandListPool.h>
 #include <RHI/CommandList.h>
 #include <RHI/Conversions.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.h
index c236975185..c9b2315f1e 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.h
@@ -12,6 +12,7 @@
 #include <Atom/RHI/ThreadLocalContext.h>
 #include <AzCore/std/containers/array.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
+#include <RHI/DX12.h>
 
 namespace AZ
 {
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.cpp
index c63a04cf17..ef888c178a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/CommandQueue.h>
 #include <RHI/Device.h>
 #include <RHI/Fence.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp
index d35e355807..b62f15f12d 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <Atom/RHI/CpuProfiler.h>
 #include <Atom/RHI/Device.h>
 #include <Atom/RHI.Reflect/CpuTimingStatistics.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.cpp
index 2e54844fc8..3c2eccc9f8 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <Atom/RHI.Reflect/Bits.h>
 #include <RHI/Conversions.h>
 #include <RHI/Buffer.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.h
index 820c516f4e..3ff5cbaddd 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.h
@@ -22,6 +22,7 @@
 #include <Atom/RHI/DrawItem.h>
 #include <Atom/RHI/Query.h>
 #include <AzCore/std/containers/vector.h>
+#include <RHI/DX12.h>
 
 namespace AZ
 {
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.cpp
index 3debd58d2a..72d79e284b 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/DX12.h>
 
 namespace AZ
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.cpp
index 5f16e2cc16..cf2a37eebb 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/Descriptor.h>
 
 namespace AZ
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.cpp
index fc86f38d26..d2a4373557 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/DescriptorContext.h>
 #include <RHI/Buffer.h>
 #include <RHI/Conversions.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.cpp
index c5234fd515..f5edd1aa17 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/DescriptorPool.h>
 #include <Atom/RHI.Reflect/Limits.h>
 #include <Atom/RHI/FreeListAllocator.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp
index 576060a500..7d8464047c 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <Atom/RHI/RHISystemInterface.h>
 #include <RHI/Device.h>
 #include <RHI/PhysicalDevice.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.cpp
index 21a9add45b..44953a0399 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/Fence.h>
 #include <RHI/Device.h>
 
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.h
index 751a44b695..b48ad79b70 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.h
@@ -11,6 +11,7 @@
 #include <AzCore/Memory/PoolAllocator.h>
 #include <AzCore/std/containers/array.h>
 #include <AzCore/std/smart_ptr/intrusive_ptr.h>
+#include <RHI/DX12.h>
 
 namespace AZ
 {
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp
index 1917d8d199..cfdbc17b91 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/FrameGraphCompiler.h>
 #include <Atom/RHI/BufferFrameAttachment.h>
 #include <Atom/RHI/BufferScopeAttachment.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.h
index b953a0c83a..2042f61649 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.h
@@ -9,6 +9,7 @@
 #include <Atom/RHI/FrameGraphCompiler.h>
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/std/optional.h>
+#include <RHI/DX12.h>
 
 namespace AZ
 {
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.cpp
index b00bf4844f..8b09fce3bf 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/FrameGraphExecuteGroup.h>
 #include <RHI/SwapChain.h>
 
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
index 88bc162114..8783d9c477 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/FrameGraphExecuteGroupBase.h>
 #include <RHI/Device.h>
 
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
index 995935ef7a..ed5ad07d31 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/FrameGraphExecuteGroupMerged.h>
 #include <RHI/SwapChain.h>
 
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp
index 51fa75afb8..91d120dab6 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/FrameGraphExecuter.h>
 #include <RHI/FrameGraphExecuteGroupMerged.h>
 #include <RHI/FrameGraphExecuteGroup.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.cpp
index 48b41a3f99..cb4f45fa11 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/Conversions.h>
 #include <RHI/Image.h>
 #include <RHI/ImageView.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp
index 1ded607837..da076490ca 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/ImagePool.h>
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.cpp
index e57191a8a2..fa37b36ff0 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/ImageView.h>
 #include <RHI/Conversions.h>
 #include <RHI/DescriptorContext.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.cpp
index 37bfbc9a54..d1dce03f7a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/IndirectBufferSignature.h>
 #include <RHI/Device.h>
 #include <RHI/Buffer.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.h
index b14ad9f70a..2d9ff589c3 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.h
@@ -9,6 +9,7 @@
 #include <Atom/RHI/IndirectBufferSignature.h>
 #include <Atom/RHI.Reflect/IndirectBufferLayout.h>
 #include <AzCore/Memory/PoolAllocator.h>
+#include <RHI/DX12.h>
 
 namespace AZ
 {
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.cpp
index aa76435f1a..32ae1fce25 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/Buffer.h>
 #include <RHI/IndirectBufferWriter.h>
 #include <RHI/IndirectBufferSignature.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp
index 2147afc695..c307371676 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
 #include <AzCore/Debug/EventTrace.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp
index ab2bf1d802..fa55db00a9 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/MemoryView.h>
 
 #include <AzCore/Debug/EventTrace.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Module.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Module.cpp
index 819d22cdaa..44503c4026 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Module.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Module.cpp
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
+
+#include <AzCore/PlatformIncl.h>
 #include <RHI/SystemComponent.h>
 #include <Atom/RHI.Reflect/DX12/ReflectSystemComponent.h>
 #include <Atom/RHI.Reflect/ReflectSystemComponent.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp
index ebfe5ba4c9..129dadff3e 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
 #include <RHI/PipelineLayout.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.h
index 00a31411eb..d66ad6fb36 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.h
@@ -14,6 +14,7 @@
 #include <AzCore/std/parallel/mutex.h>
 #include <AzCore/std/parallel/atomic.h>
 #include <AzCore/std/containers/unordered_map.h>
+#include <RHI/DX12.h>
 
 namespace AZ
 {
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.cpp
index 9fe5d2cf55..b53a18a479 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/Device.h>
 #include <RHI/PipelineLibrary.h>
 
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp
index 9cb74af42a..c1a4ec1bbe 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/PipelineState.h>
 #include <RHI/PipelineLibrary.h>
 #include <Atom/RHI.Reflect/DX12/ShaderStageFunction.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.cpp
index 2ea51ada27..86a5de7e22 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/CommandList.h>
 #include <RHI/Conversions.h>
 #include <RHI/Query.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.cpp
index 14ddbcddb5..5e18ea10a2 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
 #include <RHI/Query.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.cpp
index 7a9e232abb..553636c814 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/Device.h>
 #include <RHI/Buffer.h>
 #include <RHI/CommandList.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp
index e104cacf48..0445e1a9f5 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <AzCore/Debug/EventTrace.h>
 #include <RHI/RayTracingBlas.h>
 #include <RHI/Buffer.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.h
index a6e429569b..47c6a6125e 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.h
@@ -9,6 +9,7 @@
 #include <Atom/RHI/RayTracingAccelerationStructure.h>
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <RHI/DX12.h>
 
 namespace AZ
 {
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp
index 40862b9992..9760bd2a82 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/RayTracingPipelineState.h>
 #include <Atom/RHI.Reflect/SamplerState.h>
 #include <Atom/RHI.Reflect/DX12/ShaderStageFunction.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.h
index def2b9e8e6..ca719c4351 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.h
@@ -9,6 +9,7 @@
 #include <Atom/RHI/RayTracingPipelineState.h>
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <RHI/DX12.h>
 
 namespace AZ
 {
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp
index 83e7b70d40..69f7bfd1a9 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/RayTracingPipelineState.h>
 #include <RHI/RayTracingShaderTable.h>
 #include <Atom/RHI.Reflect/DX12/ShaderStageFunction.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp
index 99fc1e125a..69aec5a0ea 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Math/Matrix3x4.h>
 #include <RHI/RayTracingTlas.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.h
index 60db5e001d..a7f79ba845 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.h
@@ -6,6 +6,7 @@
  */
 #pragma once
 
+#include <RHI/DX12.h>
 #include <Atom/RHI/RayTracingAccelerationStructure.h>
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.cpp
index 8fc42fd2be..eb01bb6b42 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/Sampler.h>
 #include <RHI/Conversions.h>
 #include <RHI/DescriptorContext.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp
index 3c1a5b2136..7cd8db143d 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/Scope.h>
 #include <RHI/Image.h>
 #include <RHI/ImageView.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.cpp
index a1f15cc497..4819656a4c 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/ShaderResourceGroup.h>
 
 namespace AZ
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp
index 71bc45b709..86e1008352 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/ShaderResourceGroupPool.h>
 #include <RHI/Buffer.h>
 #include <RHI/BufferView.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp
index 2eb13c6ada..eccd14916b 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/StagingMemoryAllocator.h>
 #include <RHI/Device.h>
 #include <Atom/RHI/MemoryStatisticsBuilder.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp
index 95746b3475..8424da0447 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp
@@ -4,14 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/StreamingImagePool.h>
 #include <RHI/Conversions.h>
 #include <RHI/CommandList.h>
 #include <RHI/Device.h>
 #include <RHI/Image.h>
 #include <RHI/ResourcePoolResolver.h>
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <Atom/RHI/MemoryStatisticsBuilder.h>
 #include <AzCore/Debug/EventTrace.h>
 
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.cpp
index be8fcf3b38..f8e0ba766a 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/SwapChain.h>
 #include <RHI/Device.h>
 #include <RHI/Conversions.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.h
index 7fdebaf1cb..c59a6f4219 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <Atom/RHI/SwapChain.h>
+#include <RHI/DX12.h>
 
 namespace AZ
 {
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp
index 30a63fd266..d491dbf622 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "RHI/Atom_RHI_DX12_precompiled.h"
+#include <AzCore/PlatformIncl.h>
 #include <RHI/SystemComponent.h>
 #include <RHI/Buffer.h>
 #include <RHI/BufferPool.h>
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.cpp
index 48a90e9bfa..707b6251d4 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "RHI/Atom_RHI_DX12_precompiled.h"
 #include <RHI/TransientAttachmentPool.h>
 #include <Atom/RHI.Reflect/TransientAttachmentStatistics.h>
 #include <Atom/RHI.Reflect/TransientBufferDescriptor.h>
diff --git a/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_files.cmake b/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_files.cmake
index 7f739e20a3..1e491ec428 100644
--- a/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_files.cmake
+++ b/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_files.cmake
@@ -6,7 +6,6 @@
 #
 
 set(FILES
-    Source/RHI/Atom_RHI_DX12_precompiled.h
     Source/RHI/Buffer.cpp
     Source/RHI/Buffer.h
     Source/RHI/BufferPool.cpp