diff --git a/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt b/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt
index 3a57f96772..a862617740 100644
--- a/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt
+++ b/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt
@@ -66,7 +66,6 @@ ly_add_target(
     NAME Atom_RHI_Vulkan.Reflect STATIC
     NAMESPACE Gem
     FILES_CMAKE
-        atom_rhi_vulkan_common_files.cmake
         atom_rhi_vulkan_reflect_common_files.cmake
         ${pal_source_dir}/platform_reflect_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
     INCLUDE_DIRECTORIES
diff --git a/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/FunctionLoader.h b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/FunctionLoader.h
index 8a40b0e73b..70e485384b 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/FunctionLoader.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/FunctionLoader.h
@@ -6,6 +6,8 @@
  */
 
 #pragma once
+
+#include <Atom_RHI_Vulkan_precompiled_Platform.h>
 #include <Atom/RHI/Object.h>
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h b/Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
deleted file mode 100644
index 5deff32444..0000000000
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
+++ /dev/null
@@ -1,10 +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/PlatformDef.h>
-#include <Atom_RHI_Vulkan_precompiled_Platform.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/RHI/WSISurface_Android.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/RHI/WSISurface_Android.cpp
index 1dec884fd0..422b8d1b1c 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/RHI/WSISurface_Android.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/RHI/WSISurface_Android.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Conversion.h>
 #include <RHI/Instance.h>
 #include <RHI/WSISurface.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI/WSISurface_Linux.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI/WSISurface_Linux.cpp
index 0d9019a689..2dc5c1e918 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI/WSISurface_Linux.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI/WSISurface_Linux.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Conversion.h>
 #include <RHI/Instance.h>
 #include <RHI/WSISurface.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp
index ade7241987..361453f8b6 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Conversion.h>
 #include <RHI/Instance.h>
 #include <RHI/WSISurface.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp
index 5c46b2f55a..dc1d84197e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/AliasedHeap.h>
 #include <RHI/AliasingBarrierTracker.h>
 #include <RHI/Image.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.cpp
index e575f08ed6..108838526f 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/AliasingBarrierTracker.h>
 #include <RHI/Buffer.h>
 #include <RHI/Image.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp
index f0824cd3aa..c380d45ff6 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI/RHISystemInterface.h>
 #include <Atom/RHI.Reflect/PlatformLimitsDescriptor.h>
 #include <Atom/RHI/BufferPool.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.cpp
index 2dc32d0149..a60a3c6174 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/std/algorithm.h>
 #include <AzCore/std/parallel/lock.h>
 #include <AzCore/std/sort.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.cpp
index a4683512fc..9fbf0ecf55 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/BufferMemory.h>
 #include <RHI/Device.h>
 #include <RHI/Conversion.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp
index 11740621a8..b17a9acb14 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/BufferMemoryPageAllocator.h>
 #include <RHI/Device.h>
 #include <RHI/Conversion.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.cpp
index 69118beffe..abce936c4b 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI/RHISystemInterface.h>
 #include <Atom/RHI.Reflect/PlatformLimitsDescriptor.h>
 #include <Atom/RHI.Reflect/Vulkan/BufferPoolDescriptor.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.cpp
index 112f90f72a..a42b5c5cd6 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Buffer.h>
 #include <RHI/BufferPool.h>
 #include <RHI/BufferPoolResolver.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.cpp
index 6b1ed57903..752bbae640 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Buffer.h>
 #include <RHI/BufferView.h>
 #include <RHI/Conversion.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.h
index ff249ba676..e44f41ce22 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.h
@@ -6,6 +6,7 @@
  */
 #pragma once
 
+#include <Atom_RHI_Vulkan_precompiled_Platform.h>
 #include <Atom/RHI/BufferView.h>
 #include <AzCore/Memory/PoolAllocator.h>
 
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.cpp
index cc89249072..5070f50523 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/std/containers/vector.h>
 #include <AzCore/std/parallel/lock.h>
 #include <RHI/Buffer.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.cpp
index b0f78f559c..90205b27e3 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/CommandListAllocator.h>
 #include <RHI/Device.h>
 
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.cpp
index 1a6ce942b9..09c4b3278a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/CommandPool.h>
 #include <RHI/Conversion.h>
 #include <RHI/Device.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.cpp
index c19e1dc183..d6d7cdf540 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/Debug/EventTraceDrillerBus.h>
 #include <RHI/CommandList.h>
 #include <RHI/CommandQueue.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp
index 0b16223c81..63ac8ef40c 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/std/algorithm.h>
 #include <AzCore/std/sort.h>
 #include <AzCore/Debug/EventTrace.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.cpp
index d7df4b1044..727cf53d29 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/ComputePipeline.h>
 #include <RHI/Device.h>
 #include <RHI/Conversion.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.cpp
index 3144e5635f..c22ab5031a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Conversion.h>
 #include <Atom/RHI.Reflect/ImageDescriptor.h>
 #include <Atom/RHI.Reflect/ImageSubresource.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.cpp
index 70f950bcc8..cb92af4f5a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI.Reflect/ShaderResourceGroupLayoutDescriptor.h>
 #include <Atom/RHI.Reflect/ShaderResourceGroupLayout.h>
 #include <AzCore/Utils/TypeHash.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp
index 23bc2fa523..0857b5990a 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Buffer.h>
 #include <RHI/BufferPool.h>
 #include <RHI/BufferView.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.cpp
index 9ab271303a..df63581418 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/std/algorithm.h>
 #include <AzCore/std/parallel/lock.h>
 #include <Atom/RHI.Reflect/ShaderResourceGroupLayout.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.cpp
index 67b5ed4487..6a49976162 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI.Reflect/ShaderResourceGroupLayout.h>
 #include <Atom/RHI.Reflect/ShaderResourceGroupLayoutDescriptor.h>
 #include <AzCore/Utils/TypeHash.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp
index 8aaffaab41..40ee7dd0c3 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI.Loader/FunctionLoader.h>
 #include <Atom/RHI/RHISystemInterface.h>
 #include <Atom/RHI/TransientAttachmentPool.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.cpp
index a183a6b463..18701a9ecf 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Conversion.h>
 #include <RHI/Device.h>
 #include <RHI/Fence.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp
index cf618fd2de..9920674dfb 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI/BufferFrameAttachment.h>
 #include <Atom/RHI/BufferScopeAttachment.h>
 #include <Atom/RHI/BufferView.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.cpp
index f5fa6e792e..5643fd91a3 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI.Reflect/ScopeId.h>
 #include <Atom/RHI/FrameGraph.h>
 #include <RHI/CommandList.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
index 9ce9da9752..25604d59cf 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/FrameGraphExecuteGroupBase.h>
 #include <RHI/Device.h>
 
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.cpp
index a69b99dc22..51e13f1d06 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/CommandList.h>
 #include <RHI/Device.h>
 #include <RHI/FrameGraphExecuteGroupHandler.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.cpp
index 85381d77f5..126ed34aac 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI/FrameGraphExecuteGroup.h>
 #include <RHI/FrameGraphExecuteGroupBase.h>
 #include <RHI/FrameGraphExecuteGroupHandlerBase.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
index cef60103c4..73b68d94eb 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/FrameGraphExecuteGroupMerged.h>
 #include <RHI/Scope.h>
 #include <RHI/SwapChain.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.cpp
index bd8776b2ea..5520eee895 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI/ImageScopeAttachment.h>
 #include <RHI/CommandList.h>
 #include <RHI/Device.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.cpp
index 9c2a0f4002..b2f7a1d53f 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI/FrameGraph.h>
 #include <AzCore/std/parallel/thread.h>
 #include <RHI/FrameGraphExecuteGroupHandler.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.cpp
index 7cdd35ee60..165a799584 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/std/hash.h>
 #include <RHI/Conversion.h>
 #include <RHI/Device.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp
index 88a02f90c7..1247f0d2eb 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/std/algorithm.h>
 #include <Atom/RHI.Reflect/RenderStates.h>
 #include <Atom/RHI.Reflect/InputStreamLayout.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.cpp
index 7586183b63..acff709705 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/std/algorithm.h>
 #include <AzCore/std/parallel/lock.h>
 #include <AzCore/std/sort.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.cpp
index 928247346d..c0ab2eb9f2 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI/RHISystemInterface.h>
 #include <Atom/RHI.Reflect/PlatformLimitsDescriptor.h>
 #include <Atom/RHI.Reflect/ImageDescriptor.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.cpp
index 88c5602e7f..6655fcc419 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Image.h>
 #include <RHI/ImagePool.h>
 #include <RHI/ImagePoolResolver.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.cpp
index aa3c77c261..eed5ad95ba 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Conversion.h>
 #include <RHI/Device.h>
 #include <RHI/Image.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.cpp
index d8e05be10a..0dda1eb44c 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.cpp
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
+
+#include <Atom_RHI_Vulkan_precompiled_Platform.h>
 #include <RHI/IndirectBufferSignature.h>
 
 namespace AZ
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.cpp
index 43a3d19805..2bf41e546b 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Buffer.h>
 #include <RHI/IndirectBufferWriter.h>
 #include <RHI/IndirectBufferSignature.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp
index a98aad801a..70a4a02a39 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Device.h>
 #include <RHI/Instance.h>
 #include <Atom/RHI.Loader/FunctionLoader.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.cpp
index b7864e3bbe..f1f1419160 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/std/parallel/lock.h>
 #include <Atom/RHI.Reflect/Bits.h>
 #include <RHI/Memory.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.h
index 4fb24125f6..b795b26ddb 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.h
@@ -6,6 +6,7 @@
  */
 #pragma once
 
+#include <Atom_RHI_Vulkan_precompiled_Platform.h>
 #include <AzCore/Memory/PoolAllocator.h>
 #include <AzCore/std/containers/map.h>
 #include <AzCore/std/parallel/mutex.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp
index c16f28af27..ac8522ad6e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/MemoryPageAllocator.h>
 #include <RHI/Device.h>
 #include <RHI/Conversion.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.cpp
index f11d0ed124..f2e0f52a20 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/BufferView.h>
 #include <RHI/MergedShaderResourceGroup.h>
 #include <RHI/MergedShaderResourceGroupPool.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.cpp
index 8079bd10bf..68899f9c60 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/MergedShaderResourceGroup.h>
 #include <RHI/MergedShaderResourceGroupPool.h>
 
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Module.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Module.cpp
index bfc0ec79dc..fc370853d4 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Module.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Module.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/SystemComponent.h>
 #include <Atom/RHI.Reflect/Vulkan/ReflectSystemComponent.h>
 #include <Atom/RHI.Reflect/ReflectSystemComponent.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp
index 4aba0f6860..2102c730b2 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Buffer.h>
 #include <RHI/BufferPool.h>
 #include <RHI/BufferView.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp
index 52aabdec1d..72f2833ae0 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI/MemoryStatisticsBuilder.h>
 #include <AzCore/std/containers/set.h>
 #include <AzCore/std/string/conversions.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.cpp
index d48dec6eee..e0f4be7b80 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Pipeline.h>
 #include <RHI/Device.h>
 #include <RHI/PipelineLayout.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.cpp
index fb9cd8e4f1..b346eb3900 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI.Reflect/PipelineLayoutDescriptor.h>
 #include <Atom/RHI.Reflect/ShaderResourceGroupPoolDescriptor.h>
 #include <RHI/Conversion.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.cpp
index 79958c6dd2..f5a2a5d110 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Conversion.h>
 #include <RHI/Device.h>
 #include <RHI/PipelineLibrary.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.cpp
index 0a3c11d4ba..e1967ac45f 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI.Reflect/PipelineLayoutDescriptor.h>
 #include <RHI/DescriptorPool.h>
 #include <RHI/DescriptorSetLayout.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.cpp
index 8b1aca881d..a01d623add 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/CommandList.h>
 #include <RHI/Conversion.h>
 #include <RHI/Query.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.cpp
index 555577bbfe..b4e6a45669 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <RHI/Conversion.h>
 #include <RHI/Device.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.cpp
index bfa5d8dbe0..e93999d233 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/std/algorithm.h>
 #include <AzCore/std/iterator.h>
 #include <RHI/Conversion.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp
index 719c7fc16a..8989599cdd 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/Debug/EventTrace.h>
 #include <RHI/RayTracingBlas.h>
 #include <RHI/Buffer.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.h
index ce59c7f2c8..4d31676e1e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.h
@@ -6,6 +6,7 @@
  */
 #pragma once
 
+#include <Atom_RHI_Vulkan_precompiled_Platform.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/Vulkan/Code/Source/RHI/RayTracingPipeline.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.cpp
index 5894d3fdd5..8fc958e8a8 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/RayTracingPipeline.h>
 #include <RHI/Device.h>
 #include <RHI/Conversion.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp
index 4dffc5c3da..efaebf4b6b 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/RayTracingPipelineState.h>
 #include <Atom/RHI.Reflect/SamplerState.h>
 #include <Atom/RHI.Reflect/Vulkan/ShaderStageFunction.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.h
index 8bac2d57b4..b55262edc6 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.h
@@ -6,6 +6,7 @@
  */
 #pragma once
 
+#include <Atom_RHI_Vulkan_precompiled_Platform.h>
 #include <Atom/RHI/RayTracingPipelineState.h>
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp
index b6cd3fe04d..960520cf66 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/RayTracingPipelineState.h>
 #include <RHI/RayTracingShaderTable.h>
 #include <Atom/RHI.Reflect/Vulkan/ShaderStageFunction.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp
index ac43ab0589..eb2db7658e 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/Debug/EventTrace.h>
 #include <AzCore/Math/Matrix3x4.h>
 #include <RHI/RayTracingTlas.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.h
index c570eba572..3c15ef84a3 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.h
@@ -6,6 +6,7 @@
  */
 #pragma once
 
+#include <Atom_RHI_Vulkan_precompiled_Platform.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/Vulkan/Code/Source/RHI/RenderPass.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.cpp
index c66f2467a9..6b5b7f0591 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Conversion.h>
 #include <RHI/Device.h>
 #include <RHI/Framebuffer.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.h
index 5e30a0d23f..26e294ab54 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.h
@@ -6,6 +6,7 @@
  */
 #pragma once
 
+#include <Atom_RHI_Vulkan_precompiled_Platform.h>
 #include <Atom/RHI/DeviceObject.h>
 #include <Atom/RHI.Reflect/Limits.h>
 #include <Atom/RHI.Reflect/ImageScopeAttachmentDescriptor.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.cpp
index 403c6fec7a..0506e6c585 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI/BufferScopeAttachment.h>
 #include <Atom/RHI/ImageFrameAttachment.h>
 #include <Atom/RHI/ImageScopeAttachment.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.cpp
index 2461ad183c..54f624382b 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/std/hash.h>
 #include <RHI/Conversion.h>
 #include <RHI/Device.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.h
index 487d7b7b55..9d260bb743 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.h
@@ -5,6 +5,8 @@
  *
  */
 #pragma once
+
+#include <Atom_RHI_Vulkan_precompiled_Platform.h>
 #include <Atom/RHI/DeviceObject.h>
 
 namespace AZ
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.cpp
index 0189b6d325..7a9242e96c 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <algorithm>
 #include <Atom/RHI/BufferScopeAttachment.h>
 #include <Atom/RHI/BufferProperty.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.cpp
index 60137d0436..a4d9231264 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Conversion.h>
 #include <RHI/Device.h>
 #include <RHI/Semaphore.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.h
index 347a523376..acedd66eef 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.h
@@ -6,6 +6,7 @@
  */
 #pragma once
 
+#include <Atom_RHI_Vulkan_precompiled_Platform.h>
 #include <Atom/RHI/DeviceObject.h>
 #include <AzCore/Memory/PoolAllocator.h>
 #include <RHI/SignalEvent.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.cpp
index 9e3dfbbdc2..f4f703c2ed 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/base.h>
 #include <RHI/SemaphoreAllocator.h>
 #include <RHI/Device.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.cpp
index ffc04b99ff..227b5cd1e8 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/Conversion.h>
 #include <RHI/Device.h>
 #include <RHI/ShaderModule.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.cpp
index 527fbf3858..7d0d7565a8 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/std/utils.h>
 #include <AzCore/std/parallel/lock.h>
 #include <RHI/DescriptorSet.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp
index 4871b7027d..01f7516044 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI/BufferPool.h>
 #include <Atom/RHI/BufferView.h>
 #include <Atom/RHI/ImageView.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.cpp
index e009f1d29a..eb0ac15c0f 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/SignalEvent.h>
 
 namespace AZ
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.cpp
index 613e280f98..b401b2291f 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI/RHISystemInterface.h>
 #include <Atom/RHI.Reflect/PlatformLimitsDescriptor.h>
 #include <Atom/RHI.Reflect/Vulkan/ImagePoolDescriptor.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePoolResolver.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePoolResolver.cpp
index 3c72b860d9..59e600bac7 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePoolResolver.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePoolResolver.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <AzCore/std/containers/fixed_unordered_map.h>
 #include <AzCore/std/parallel/lock.h>
 #include <RHI/StreamingImagePoolResolver.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
index d356d61cef..d887d98f58 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI/PipelineStateDescriptor.h>
 #include <Atom/RHI.Reflect/ClearValue.h>
 #include <Atom/RHI.Reflect/ImageScopeAttachmentDescriptor.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp
index 89e062fb20..ab8a6cbc32 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI.Reflect/ShaderResourceGroupLayout.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.cpp
index b659dd60af..9f75e633ea 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <Atom/RHI.Reflect/TransientBufferDescriptor.h>
 #include <Atom/RHI.Reflect/TransientImageDescriptor.h>
 #include <RHI/Buffer.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.cpp
index acb0a33a24..94715aa0c3 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <stdarg.h>
 #include <algorithm>
 #include <Atom/RHI.Reflect/Bits.h>
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.cpp
index 16f170226b..3a5359e461 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Vulkan_precompiled.h"
 #include <RHI/WSISurface.h>
 #include <RHI/Instance.h>
 
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.h
index 79053ddb40..11a3ab1215 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.h
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.h
@@ -6,6 +6,7 @@
  */
 #pragma once
 
+#include <Atom_RHI_Vulkan_precompiled_Platform.h>
 #include <Atom/RHI/Object.h>
 #include <Atom/RHI.Reflect/SwapChainDescriptor.h>
 
diff --git a/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
deleted file mode 100644
index 8bd07760e0..0000000000
--- a/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
+++ /dev/null
@@ -1,10 +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
-#
-#
-
-set(FILES
-    Source/Atom_RHI_Vulkan_precompiled.h
-)