diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/ClearPass.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/ClearPass.h
index e917584fca..3599e6de44 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/ClearPass.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Public/Pass/ClearPass.h
@@ -8,11 +8,6 @@
 #pragma once
 
 #include <AzCore/Memory/SystemAllocator.h>
-
-#include <Atom/RHI/CommandList.h>
-#include <Atom/RHI/DrawItem.h>
-#include <Atom/RHI/ScopeProducer.h>
-
 #include <Atom/RPI.Public/Pass/RenderPass.h>
 
 namespace AZ
@@ -38,8 +33,8 @@ namespace AZ
             void InitializeInternal() override;
 
         private:
-
             RHI::ClearValue m_clearValue;
         };
+
     }   // namespace RPI
 }   // namespace AZ
diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/ClearPassData.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/ClearPassData.h
index 5eed6d54fa..9c03f5ccd6 100644
--- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/ClearPassData.h
+++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Pass/ClearPassData.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #include <Atom/RHI.Reflect/ClearValue.h>
-
 #include <Atom/RPI.Reflect/Pass/RenderPassData.h>
 
 namespace AZ
@@ -38,6 +37,7 @@ namespace AZ
 
             RHI::ClearValue m_clearValue;
         };
+
     } // namespace RPI
 } // namespace AZ
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/ClearPass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/ClearPass.cpp
index 1ba16f4b5a..0e3ea76728 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/ClearPass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/ClearPass.cpp
@@ -8,20 +8,8 @@
 
 #include <Atom/RPI.Public/Pass/ClearPass.h>
 #include <Atom/RPI.Public/Pass/PassUtils.h>
-#include <Atom/RPI.Public/RPIUtils.h>
-#include <Atom/RPI.Public/Shader/ShaderReloadDebugTracker.h>
 
 #include <Atom/RPI.Reflect/Pass/ClearPassData.h>
-#include <Atom/RPI.Reflect/Pass/PassTemplate.h>
-#include <Atom/RPI.Reflect/Shader/ShaderAsset.h>
-
-#include <Atom/RHI/Factory.h>
-#include <Atom/RHI/FrameScheduler.h>
-#include <Atom/RHI/PipelineState.h>
-
-#include <AzCore/Asset/AssetCommon.h>
-#include <AzCore/Asset/AssetManagerBus.h>
-#include <AzCore/std/algorithm.h>
 
 namespace AZ
 {