diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/PixelFormats.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/PixelFormats.h
index e2d8c7b8e3..22ac22fea0 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/PixelFormats.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/PixelFormats.h
@@ -6,6 +6,7 @@
  */
 #pragma once
 
+#include <AzCore/RTTI/RTTI.h>
 
 namespace ImageProcessingAtom
 {
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp
index eb5f0a1629..2c562ddfdd 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ImageProcessing_precompiled.h"
 
 #include "BuilderSettingManager.h"
 #include <QDirIterator>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.cpp
index b85ef41967..accf9fcb16 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "ImageProcessing_precompiled.h"
 #include <BuilderSettings/BuilderSettings.h>
 #include <AzCore/Serialization/SerializeContext.h>
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.cpp
index 262efd5a8e..da8c0f1d46 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ImageProcessing_precompiled.h"
 #include <BuilderSettings/CubemapSettings.h>
 #include <AzCore/Serialization/SerializeContext.h>
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.cpp
index c0c167476a..fbf39942e6 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ImageProcessing_precompiled.h"
 #include <BuilderSettings/MipmapSettings.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.cpp
index 2b53fbd95f..7f2df2c081 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ImageProcessing_precompiled.h"
 #include <BuilderSettings/PresetSettings.h>
 #include <Processing/PixelFormatInfo.h>
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.cpp
index f323ba29ee..3777f44ddc 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ImageProcessing_precompiled.h"
 #include <BuilderSettings/TextureSettings.h>
 #include <AzCore/RTTI/ReflectContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.cpp
index d4b6a2b85a..f6ffeb6f1a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <Atom/ImageProcessing/ImageObject.h>
 #include <Processing/ImageToProcess.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.cpp
index 1f4dfb7ef8..00f23eedc4 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <Compressors/CTSquisher.h>
 #include <Compressors/PVRTC.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.cpp
index f6461461a1..0891f32ff9 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include <ImageProcessing_precompiled.h>
 
 #include <AzCore/Math/MathUtils.h>
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.cpp
index 9ce7e9e897..ae7beacca9 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include <ImageProcessing_precompiled.h>
 
 #include <AzCore/Math/MathUtils.h>
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.cpp
index 8817c55572..f612a69558 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include <ImageProcessing_precompiled.h>
 
 #include <AzCore/Math/MathUtils.h>
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorTypes.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorTypes.h
index d6a1381e65..99135dbc39 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorTypes.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorTypes.h
@@ -5,9 +5,10 @@
  *
  */
 
-
 #pragma once
 
+#include <ImageBuilderBaseType.h>
+
 namespace ImageProcessingAtom
 {
     // 32 bit 8888 RGBA color
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp
index 7e0161f519..bc6b515d8a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include <ImageProcessing_precompiled.h>
 #include <ImageProcessing_Traits_Platform.h>
 #include "ColorBlockRGBA4x4c.h"
 #include "ColorBlockRGBA4x4s.h"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp
index db2e0e8ea0..2e1ecbbd1f 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <Atom/ImageProcessing/ImageObject.h>
 #include <Processing/PixelFormatInfo.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.cpp
index 22c87999aa..026454e7c1 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <AzCore/std/function/function_template.h>
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.cpp
index a40bc5ca49..bd4c57cda8 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 #include <ImageProcessing_Traits_Platform.h>
 #include <Atom/ImageProcessing/ImageObject.h>
 #include <Processing/ImageFlags.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/AlphaCoverage.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/AlphaCoverage.cpp
index 01bb94ba76..b9085f3b90 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/AlphaCoverage.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/AlphaCoverage.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <Processing/ImageObjectImpl.h>
 #include <Processing/ImageConvert.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp
index ecd5328f06..d58cc1aa6e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <Processing/ImageObjectImpl.h>
 #include <Processing/ImageToProcess.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp
index 7585cbd97e..1b52b81644 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <Processing/ImageFlags.h>
 #include <Processing/ImageObjectImpl.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.cpp
index bdb455ec04..2af889cc86 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <Processing/ImageObjectImpl.h>
 #include <Processing/ImageToProcess.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.h
index 515216866a..2c8db46575 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <ImageBuilderBaseType.h>
+
 namespace ImageProcessingAtom
 {
     // note: O3DE is right hand Z up coordinate
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp
index 151c34197b..31807a4ad9 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <AzCore/Memory/OSAllocator.h>
 #include <AzCore/base.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.cpp
index bec32a18c6..77a25cbb46 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.cpp
@@ -5,11 +5,9 @@
  *
  */
 
-
-#include <ImageProcessing_precompiled.h>
-
 #include <math.h>
 #include "FIR-Weights.h"
+#include <AzCore/Debug/Trace.h>
 
 /* ####################################################################################################################
  */
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Gamma.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Gamma.cpp
index 6cd48a02c2..512e5785ca 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Gamma.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Gamma.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <ImageProcessing_precompiled.h>
 
 #include <Atom/ImageProcessing/ImageObject.h>
 #include <Processing/ImageToProcess.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp
index 263d94cf90..19a149b3f5 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <Processing/ImageObjectImpl.h>
 #include <Processing/ImageToProcess.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.cpp
index 3878b38263..1c1a296157 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <Atom/ImageProcessing/PixelFormats.h>
 #include <Atom/ImageProcessing/ImageObject.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Normalize.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Normalize.cpp
index 8ac39a8413..c9e44c532b 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Normalize.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Normalize.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include <ImageProcessing_precompiled.h>
 
 #include <Processing/ImageObjectImpl.h>
 #include <Processing/ImageFlags.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.cpp
index a73e145b54..4871edff75 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <AzCore/std/smart_ptr/make_shared.h>
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.h
index a20c5cbe76..663bb82dd7 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <Atom/ImageProcessing/PixelFormats.h>
+#include <ImageBuilderBaseType.h>
 
 namespace ImageProcessingAtom
 {
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp
index ce23058fcc..740ef47c92 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 #include <ImageProcessing_Traits_Platform.h>
 #include <Editor/EditorCommon.h>
 #include <Processing/ImageToProcess.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.cpp
index 0fa1832cb6..a5c2a09e21 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 #include "ImagePopup.h"
 
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.cpp
index 2b1e1a6e07..f257b91847 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 #include "MipmapSettingWidget.h"
 #include <Source/Editor/ui_MipmapSettingWidget.h>
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.cpp
index 32d461db46..67b373d07e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 #include "PresetInfoPopup.h"
 #include <Source/Editor/ui_PresetInfoPopup.h>
 #include <BuilderSettings/PresetSettings.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.cpp
index 19a100d126..f3c58e42c0 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 #include "ResolutionSettingItemWidget.h"
 #include <Source/Editor/ui_ResolutionSettingItemWidget.h>
 #include <BuilderSettings/PresetSettings.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.cpp
index 14d2991fba..7a3481c2ad 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 #include "ResolutionSettingWidget.h"
 #include <Source/Editor/ui_ResolutionSettingWidget.h>
 #include <QVBoxLayout>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp
index 0cbf1b996a..6f1a95ec66 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 #include "TexturePresetSelectionWidget.h"
 #include <Source/Editor/ui_TexturePresetSelectionWidget.h>
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.cpp
index 7adac7cdab..185e7ad486 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 #include "TexturePreviewWidget.h"
 #include <Processing/PixelFormatInfo.h>
 #include <Atom/ImageProcessing/ImageObject.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.cpp
index 0be72ce1d8..a46da5ec1b 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 #include "TexturePropertyEditor.h"
 
 // warning C4251: 'QBrush::d': class 'QScopedPointer<QBrushData,QBrushDataPointerDeleter>' needs to have dll-interface to be used by clients of class 'QBrush'
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.h
index 0e3c0bc201..c60262f5f4 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
+#include <AzCore/PlatformDef.h>
 // warning C4251: 'QBrush::d': class 'QScopedPointer<QBrushData,QBrushDataPointerDeleter>' needs to have dll-interface to be used by clients of class 'QBrush'
 // warning C4800: 'uint': forcing value to bool 'true' or 'false' (performance warning)
 AZ_PUSH_DISABLE_WARNING(4800 4251, "-Wunknown-warning-option")
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp
index d24541eded..a8c990e4cf 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ImageProcessing_precompiled.h"
 #include <ImageBuilderComponent.h>
 #include <AzCore/std/string/conversions.h>
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp
index c4c49c1d3b..985d034ff2 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ImageProcessing_precompiled.h"
 
 #include <AzCore/Debug/Trace.h>
 #include <AzCore/Math/MathUtils.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ExrLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ExrLoader.cpp
index 47ee234ac7..c8c6ca6b28 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ExrLoader.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ExrLoader.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ImageProcessing_precompiled.h"
 
 #include <ImageLoader/ImageLoaders.h>
 #include <Atom/ImageProcessing/ImageObject.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.cpp
index 889178121a..c18014b122 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <ImageLoader/ImageLoaders.h>
 #include <Atom/ImageProcessing/ImageObject.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/QtImageLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/QtImageLoader.cpp
index 1fb2202d2a..2e0be40ca9 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/QtImageLoader.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/QtImageLoader.cpp
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "ImageProcessing_precompiled.h"
 
 #include <ImageLoader/ImageLoaders.h>
 #include <Atom/ImageProcessing/ImageObject.h>
+#include <ImageBuilderBaseType.h>
 
 //  warning C4251: class QT_Type needs to have dll-interface to be used by clients of class 'QT_Type'
 AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option")
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp
index 2164723e93..fe22c06732 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ImageProcessing_precompiled.h"
 
 #include <AzCore/Debug/Trace.h>
 #include <AzCore/Math/MathUtils.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingModule.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingModule.cpp
index 5164ab9733..c3bbd56673 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingModule.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingModule.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ImageProcessing_precompiled.h"
 #include <AzCore/Module/Module.h>
 #include "ImageProcessingSystemComponent.h"
 #include "ImageBuilderComponent.h"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.cpp
index 2c84b409c7..08dd0d6538 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ImageProcessing_precompiled.h"
 
 #include <Atom/RPI.Reflect/Image/StreamingImageAsset.h>
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
deleted file mode 100644
index c2894ceffc..0000000000
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
+++ /dev/null
@@ -1,29 +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
-
-/////////////////////////////////////////////////////////////////////////////
-// Qt
-/////////////////////////////////////////////////////////////////////////////
-#include <QWidget>
-#include <QMainWindow>
-#include <QApplication>
-
-/////////////////////////////////////////////////////////////////////////////
-// AZCore
-/////////////////////////////////////////////////////////////////////////////
-#include <AzCore/Math/Color.h>
-#include <AzCore/Math/Vector4.h>
-#include <AzCore/Memory/Memory.h>
-#include <AzCore/Debug/Trace.h>
-#include <AzCore/PlatformIncl.h>
-
-/////////////////////////////////////////////////////////////////////////////
-//Type definitions
-/////////////////////////////////////////////////////////////////////////////
-#include <ImageBuilderBaseType.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.cpp
index a1d69ac13c..2403d4374c 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.cpp
@@ -4,10 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <ImageProcessing_precompiled.h>
 
+#include <AzCore/PlatformDef.h>
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
-
 #include <Source/Previewer/ImagePreviewer.h>
 #include <Source/Previewer/ui_ImagePreviewer.h>
 #include <Editor/EditorCommon.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.cpp
index c2bb085609..118db25730 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.cpp
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <ImageProcessing_precompiled.h>
 
+#include <AzCore/PlatformDef.h>
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
 
 #include <Source/Previewer/ImagePreviewer.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h
index d39b02f2f6..d24a8eb6f9 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h
@@ -6,9 +6,11 @@
  */
 
 #pragma once
+
 #include <AzCore/Math/Color.h>
 #include <AzCore/std/algorithm.h>
 #include <ImageProcessing_Traits_Platform.h>
+#include <ImageBuilderBaseType.h>
 
 #define IMAGE_BUIDER_MAKEFOURCC(ch0, ch1, ch2, ch3)           \
     ((AZ::u32)(AZ::u8)(ch0) | ((AZ::u32)(AZ::u8)(ch1) << 8) | \
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.cpp
index 87836d187c..4ec1824497 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <Processing/ImageAssetProducer.h>
 #include <Processing/ImageObjectImpl.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp
index be98820442..f59e1aa34f 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
-
 #include <Processing/PixelFormatInfo.h>
 #include <Processing/ImageToProcess.h>
 #include <Processing/ImageConvert.h>
@@ -24,10 +22,6 @@
 
 #include <AzToolsFramework/API/EditorAssetSystemAPI.h>
 
-// qt has convenience functions to handle file
-#include <qfile.h>
-#include <qdir.h>
-
 // for texture splitting
 // minimum number of low level mips will be saved in the base file.
 #define MinPersistantMips 3
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h
index 649b9e5f9b..26f082ee34 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h
@@ -20,6 +20,7 @@
 #include <AzCore/Asset/AssetCommon.h>
 
 #include <AssetBuilderSDK/AssetBuilderSDK.h>
+#include <ImageBuilderBaseType.h>
 
 namespace ImageProcessingAtom
 {
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp
index db9dc66e38..035b44fc8d 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <Processing/ImageConvertJob.h>
 #include <Processing/PixelFormatInfo.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h
index 49f13bf17e..0953836cc3 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <AzCore/base.h>
+
 namespace ImageProcessingAtom
 {
     // flags to propagate from the RC to the engine through GetImageFlags()
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp
index 4d2911ca4f..c4b936f55c 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <Processing/ImageObjectImpl.h>
 #include <Processing/PixelFormatInfo.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp
index edf4f26563..c692fe48dc 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp
@@ -5,8 +5,7 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
-
+#include <AzCore/PlatformIncl.h>
 #include <Processing/ImagePreview.h>
 #include <BuilderSettings/BuilderSettingManager.h>
 #include <ImageLoader/ImageLoaders.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageToProcess.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageToProcess.h
index 1f814b052a..f47efdb8d5 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageToProcess.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageToProcess.h
@@ -10,6 +10,7 @@
 #include <Atom/ImageProcessing/PixelFormats.h>
 #include <Atom/ImageProcessing/ImageObject.h>
 #include <Compressors/Compressor.h>
+#include <ImageBuilderBaseType.h>
 
 namespace ImageProcessingAtom
 {
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp
index 60bada1449..96a45061c0 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <Processing/PixelFormatInfo.h>
 #include <Processing/DDSHeader.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.h
index f65bb98c53..47beb3fa91 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.h
@@ -14,6 +14,8 @@
 #include <AzCore/std/containers/map.h>
 #include <AzCore/std/string/string.h>
 
+#include <ImageBuilderBaseType.h>
+
 namespace ImageProcessingAtom
 {
     //The original implementation was from cryhalf's CryConvertFloatToHalf and CryConvertHalfToFloat function
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp
index 0b1ed339aa..5071ae1c8a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <Atom/RPI.Reflect/Image/StreamingImageAsset.h>
 #include <Atom/RPI.Reflect/Image/StreamingImageAssetHandler.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp
index 3fc6843d5e..0e169cbc32 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ImageProcessing_precompiled.h"
 
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
index d5434091f8..7c9cfb35a5 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <ImageProcessing_precompiled.h>
 
 #include <AzTest/AzTest.h>
 #include <AzTest/Utils.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake
index 157c99857a..95e31caeb8 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake
@@ -6,7 +6,6 @@
 #
 
 set(FILES
-    Source/ImageProcessing_precompiled.h
     Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp
     Source/Compressors/CryTextureSquisher/CryTextureSquisher.h
     Include/Atom/ImageProcessing/ImageProcessingBus.h
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp
index 271013adef..805a25ce38 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp
@@ -8,7 +8,6 @@
 //=============================================================================
 // Modified from original
 
-#include <ImageProcessing_precompiled.h>
 
 #include "CBBoxInt32.h"
 
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h
index 53f32f8cd5..bc259ec4be 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h
@@ -9,6 +9,8 @@
 
 #pragma once
 
+#include <ImageBuilderBaseType.h>
+
 namespace ImageProcessingAtom
 {
     //bounding box class with coords specified as int32
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp
index 8264003b0b..fa861c739a 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp
@@ -3,7 +3,6 @@
 //=============================================================================
 // Modified from original
 
-#include <ImageProcessing_precompiled.h>
 #include "CCubeMapProcessor.h"
 
 #include <AzCore/std/bind/bind.h>
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp
index f7da8a3c4a..e25a63bc4e 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp
@@ -14,11 +14,8 @@
 //--------------------------------------------------------------------------------------
 // Modified from original
 
-#include <ImageProcessing_precompiled.h>
-
 #include "CImageSurface.h"
 
-
 namespace ImageProcessingAtom
 {
     //--------------------------------------------------------------------------------------
@@ -275,7 +272,7 @@ namespace ImageProcessingAtom
 
         SAFE_DELETE_ARRAY(m_ImgData);   //safe delete old image data
 
-        m_ImgData = new(std::nothrow) CP_ITYPE[m_Width * m_Height * m_NumChannels];   //assume tight data packing
+        m_ImgData = new CP_ITYPE[m_Width * m_Height * m_NumChannels];   //assume tight data packing
         if (!m_ImgData)
         {
             FatalError(L"Unable to allocate data for image in CImageSurface::Init.");
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h
index 6ad8f68ebc..848cbd1dbe 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h
+++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h
@@ -13,7 +13,7 @@
 #include <stdio.h>
 
 #include "VectorMacros.h"
-
+#include <ImageBuilderBaseType.h>
 
 #ifndef WCHAR 
 #define WCHAR wchar_t