diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/AttachmentImagePool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/AttachmentImagePool.cpp
index 27b1a7e666..cb8b75bff8 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AttachmentImagePool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AttachmentImagePool.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "CryRenderOther_precompiled.h"
+
 #include "AttachmentImagePool.h"
 #include "Conversions.h"
 #include "Image.h"
diff --git a/Gems/Atom/RHI/Metal/Code/CMakeLists.txt b/Gems/Atom/RHI/Metal/Code/CMakeLists.txt
index 2c6d659d3b..f938b61b21 100644
--- a/Gems/Atom/RHI/Metal/Code/CMakeLists.txt
+++ b/Gems/Atom/RHI/Metal/Code/CMakeLists.txt
@@ -71,7 +71,6 @@ ly_add_target(
     NAME Atom_RHI_Metal.Private.Static STATIC
     NAMESPACE Gem
     FILES_CMAKE
-        atom_rhi_metal_common_files.cmake
         atom_rhi_metal_private_common_files.cmake
         Source/Platform/${PAL_PLATFORM_NAME}/platform_private_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
     PLATFORM_INCLUDE_FILES
diff --git a/Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h b/Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h
deleted file mode 100644
index 146b14f9b6..0000000000
--- a/Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_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_Metal_precompiled_Platform.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
index 44940989e7..c8901b32f7 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Metal_precompiled.h"
 #include <AzCore/Module/Module.h>
 
 namespace AZ
diff --git a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.cpp
index d295dbdd92..e7e621af17 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 #include <RHI/Conversions.h>
 
 namespace AZ
diff --git a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Metal_RHI_Mac.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Metal_RHI_Mac.cpp
index de3bc23a11..15582962b6 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Metal_RHI_Mac.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Metal_RHI_Mac.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Metal_precompiled.h"
 
 #import <QuartzCore/CAMetalLayer.h>
 #include <RHI/Buffer.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.cpp
index a5233da500..ab3a45f698 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 #include <RHI/Conversions.h>
 
 namespace AZ
diff --git a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Metal_RHI_iOS.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Metal_RHI_iOS.cpp
index b7c309fba2..6cf2fbb7b5 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Metal_RHI_iOS.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Metal_RHI_iOS.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Metal_precompiled.h"
 
 #import <QuartzCore/CAMetalLayer.h>
 #include <RHI/Buffer.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp
index 0e901107d2..402fad5ac7 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 #include <Atom/RHI/MemoryStatisticsBuilder.h>
 #include <Atom/RHI.Reflect/TransientImageDescriptor.h>
 #include <Atom/RHI.Reflect/TransientBufferDescriptor.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.cpp
index 152d4195a5..acfbd4daba 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 #include <RHI/AliasingBarrierTracker.h>
 #include <RHI/Device.h>
 #include <RHI/Scope.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.cpp
index 3db2092fcb..1d49c7111d 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <Atom/RHI.Reflect/SamplerState.h>
 #include <AzCore/std/containers/vector.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp
index 2641324486..86daa0aefc 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Metal_precompiled.h"
 #include <Atom/RHI/RHISystemInterface.h>
 #include <Atom/RHI.Reflect/PlatformLimitsDescriptor.h>
 #include <Atom/RHI/BufferPool.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.cpp
index 3b9c38a01b..fc07e9fdf5 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <RHI/Buffer.h>
 
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp
index be27964194..07f521078a 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <AzCore/Casting/lossy_cast.h>
 #include <RHI/BufferMemoryAllocator.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.cpp
index fdde4eb4a8..b94c54d9b0 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <RHI/BufferMemoryView.h>
 
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.cpp
index 498cf68015..77a3030d3c 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Metal_precompiled.h"
 #include <Atom/RHI/RHISystemInterface.h>
 #include <Atom/RHI.Reflect/PlatformLimitsDescriptor.h>
 #include <Atom/RHI.Reflect/Metal/BufferPoolDescriptor.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.cpp
index a9635701cc..0ea6196b7b 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 #include <RHI/Buffer.h>
 #include <RHI/BufferPool.h>
 #include <RHI/BufferPoolResolver.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.cpp
index 7d9c9f567e..f95c94c7f1 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <RHI/Buffer.h>
 #include <RHI/BufferView.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp
index 451f6b96a6..1ef0831261 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <Atom/RHI.Reflect/Bits.h>
 #include <AzCore/Debug/EventTrace.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp
index 675a593bc8..0ad12f985d 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <Atom/RHI.Reflect/AttachmentEnums.h>
 #include <AzCore/Debug/EventTrace.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.cpp
index f592a18358..0da6382031 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <RHI/CommandList.h>
 #include <RHI/CommandListPool.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.cpp
index d8e1e98a23..e7407ece80 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 #include <Atom/RHI.Reflect/CpuTimingStatistics.h>
 #include <AzCore/Debug/EventTrace.h>
 #include <RHI/CommandQueue.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp
index a48e5f5bbf..63e67dde95 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <Atom/RHI.Reflect/ImageDescriptor.h>
 #include <Atom/RHI.Reflect/Bits.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp
index 5e23353b65..fff096eb8b 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 #include <Atom/RHI/RHISystemInterface.h>
 #include <AzCore/Debug/EventTrace.h>
 #include <AzFramework/API/ApplicationAPI.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.cpp
index ec290e5ad5..96f58a448d 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <RHI/Device.h>
 #include <RHI/Fence.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp
index 24b2eb688f..f51e1b4d8a 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 #include <Atom/RHI/CpuProfiler.h>
 #include <Atom/RHI/FrameGraph.h>
 #include <AzCore/Debug/EventTrace.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.cpp
index 8f052b1f0c..d6637726f6 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <RHI/FrameGraphExecuteGroup.h>
 #include <RHI/Scope.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
index 270c01c562..01ffd57eed 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 #include <RHI/Device.h>
 #include <RHI/FrameGraphExecuteGroupBase.h>
 
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
index 4d2125ef3f..9d27d67bba 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <RHI/FrameGraphExecuteGroupMerged.h>
 #include <RHI/Scope.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp
index 210e749509..7aa7e0ef1f 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <Atom/RHI/FrameGraph.h>
 #include <AzCore/Debug/EventTrace.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.cpp
index 2d0482256d..d5c33b76de 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.cpp
index dba6488a64..7280bf20cb 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <RHI/BufferPool.h>
 #include <RHI/Device.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.cpp
index e4ce093ce6..5ca4b5df3d 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <RHI/Buffer.h>
 #include <RHI/BufferPool.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.cpp
index 652f60e2fc..ebf4cf0631 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp
index 65004f4fea..9117a366b3 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <RHI/Conversions.h>
 #include <RHI/Device.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.cpp
index 3478d033b4..ecdf7ad20a 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <RHI/Metal.h>
 
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.mm b/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.mm
index cb07113b00..d973517290 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.mm
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.mm
@@ -5,7 +5,6 @@
  *
  */
 
-#include "Atom_RHI_Metal_precompiled.h"
 #import <RHI/MetalViewController.h>
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzFramework/Windowing/WindowBus.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Module.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Module.cpp
index 43b37599dd..9ceac76627 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Module.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Module.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <Atom/RHI.Reflect/Metal/ReflectSystemComponent.h>
 #include <Atom/RHI.Reflect/ReflectSystemComponent.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.cpp
index 61316d25b8..eaec2fc989 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 #include <RHI/NullDescriptorManager.h>
 #include <RHI/Device.h>
 
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.cpp
index 6002d96cb2..7e7b49cf43 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <Atom/RHI.Reflect/Metal/PipelineLayoutDescriptor.h>
 #include <Atom/RHI.Reflect/ShaderStages.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.cpp
index 4bc81407e9..a1a35990b6 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <RHI/Device.h>
 #include <RHI/PipelineLibrary.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp
index 61068f66c9..df2b09fcfa 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <Atom/RHI/PipelineStateDescriptor.h>
 #include <Atom/RHI.Reflect/Metal/PipelineLayoutDescriptor.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.cpp
index 9d0fc00c55..c779080fbe 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 #include <RHI/CommandList.h>
 #include <RHI/Device.h>
 #include <RHI/Query.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.cpp
index c2ea8826bb..7342fa86a3 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 #include <RHI/Device.h>
 #include <RHI/Query.h>
 #include <RHI/QueryPool.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp
index bbd99b0fe0..3872783f22 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 #include <Atom/RHI/CpuProfiler.h>
 #include <Atom/RHI/ImageScopeAttachment.h>
 #include <Atom/RHI/ResolveScopeAttachment.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.cpp
index 20ac8c423e..462648f2df 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <RHI/ArgumentBuffer.h>
 #include <RHI/ImageView.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp
index 65409d3fe0..3396b33246 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <AzCore/Debug/EventTrace.h>
 #include <RHI/ArgumentBuffer.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp
index 9659bfa641..2495722256 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <Atom/RHI/MemoryStatisticsBuilder.h>
 #include <AzCore/Casting/lossy_cast.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp
index 6e34584144..0f8825dec6 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <AzCore/Debug/EventTrace.h>
 #include <RHI/StreamingImagePool.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp
index 31d23e5100..5c38fad5f0 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <AzCore/std/string/conversions.h>
 #include <AzCore/std/string/string.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp
index 70dcddb651..4c6764ddd5 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <Atom/RHI/FactoryManagerBus.h>
 #include <Atom/RHI/Fence.h>
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.cpp
index 11e4c85956..34e0d7342c 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "Atom_RHI_Metal_precompiled.h"
 
 #include <Atom/RHI.Reflect/TransientImageDescriptor.h>
 #include <Atom/RHI/AliasedAttachmentAllocator.h>
diff --git a/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake
deleted file mode 100644
index b584d3d25f..0000000000
--- a/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_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_Metal_precompiled.h
-)