diff --git a/Code/Legacy/CryCommon/IMNM.h b/Code/Legacy/CryCommon/IMNM.h
index 0e12911089..9f7d55ad52 100644
--- a/Code/Legacy/CryCommon/IMNM.h
+++ b/Code/Legacy/CryCommon/IMNM.h
@@ -11,6 +11,8 @@
 
 #pragma once
 
+#include <CryCommon/BaseTypes.h>
+
 namespace MNM
 {
     namespace Constants
@@ -62,7 +64,7 @@ namespace MNM
         GlobalIslandID(const uint64 defaultValue = MNM::Constants::eGlobalIsland_InvalidIslandID)
             : id(defaultValue)
         {
-            STATIC_ASSERT(sizeof(StaticIslandID) <= 4, "The maximum supported size for StaticIslandIDs is 4 bytes.");
+            static_assert(sizeof(StaticIslandID) <= 4, "The maximum supported size for StaticIslandIDs is 4 bytes.");
         }
 
         GlobalIslandID(const uint32 navigationMeshID, const MNM::StaticIslandID islandID)
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiTransform2dBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTransform2dBus.h
index 49591cbc5f..436841e904 100644
--- a/Code/Legacy/CryCommon/LyShine/Bus/UiTransform2dBus.h
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiTransform2dBus.h
@@ -9,6 +9,7 @@
 #include <AzCore/Component/ComponentBus.h>
 #include <AzCore/Math/Vector2.h>
 #include <LyShine/Bus/UiTransformBus.h>
+#include <CryCommon/Cry_Color.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 class UiTransform2dInterface
diff --git a/Code/Legacy/CryCommon/LyShine/Bus/UiTransformBus.h b/Code/Legacy/CryCommon/LyShine/Bus/UiTransformBus.h
index 05ae14c22c..63f052ff4f 100644
--- a/Code/Legacy/CryCommon/LyShine/Bus/UiTransformBus.h
+++ b/Code/Legacy/CryCommon/LyShine/Bus/UiTransformBus.h
@@ -428,26 +428,26 @@ inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedSize() const
 
 inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedTopLeft() const
 {
-    return AZ::Vector2(min(min(min(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
-        min(min(min(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
+    return AZ::Vector2(AZStd::min(AZStd::min(AZStd::min(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
+        AZStd::min(AZStd::min(AZStd::min(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
 }
 
 inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedTopRight() const
 {
-    return AZ::Vector2(max(max(max(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
-        min(min(min(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
+    return AZ::Vector2(AZStd::max(AZStd::max(AZStd::max(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
+        AZStd::min(AZStd::min(AZStd::min(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
 }
 
 inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedBottomRight() const
 {
-    return AZ::Vector2(max(max(max(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
-        max(max(max(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
+    return AZ::Vector2(AZStd::max(AZStd::max(AZStd::max(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
+        AZStd::max(AZStd::max(AZStd::max(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
 }
 
 inline AZ::Vector2 UiTransformInterface::RectPoints::GetAxisAlignedBottomLeft() const
 {
-    return AZ::Vector2(min(min(min(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
-        max(max(max(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
+    return AZ::Vector2(AZStd::min(AZStd::min(AZStd::min(TopLeft().GetX(), TopRight().GetX()), BottomRight().GetX()), BottomLeft().GetX()),
+        AZStd::max(AZStd::max(AZStd::max(TopLeft().GetY(), TopRight().GetY()), BottomRight().GetY()), BottomLeft().GetY()));
 }
 
 inline void UiTransformInterface::RectPoints::SetAxisAligned(float left, float right, float top, float bottom)
diff --git a/Code/Legacy/CryCommon/LyShine/IDraw2d.h b/Code/Legacy/CryCommon/LyShine/IDraw2d.h
index c45f7d1000..448d5cfc9f 100644
--- a/Code/Legacy/CryCommon/LyShine/IDraw2d.h
+++ b/Code/Legacy/CryCommon/LyShine/IDraw2d.h
@@ -9,6 +9,7 @@
 #include <AzCore/Math/Vector2.h>
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Math/Color.h>
+#include <AzCore/std/string/string.h>
 
 // Forward declarations
 struct IFFont;
diff --git a/Gems/LyShine/Code/Pipeline/LyShineBuilder/LyShineBuilderComponent.cpp b/Gems/LyShine/Code/Pipeline/LyShineBuilder/LyShineBuilderComponent.cpp
index 0258f2b423..16b230babc 100644
--- a/Gems/LyShine/Code/Pipeline/LyShineBuilder/LyShineBuilderComponent.cpp
+++ b/Gems/LyShine/Code/Pipeline/LyShineBuilder/LyShineBuilderComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
-
 #include <Pipeline/LyShineBuilder/LyShineBuilderComponent.h>
 
 #include <AzCore/Component/ComponentApplication.h>
diff --git a/Gems/LyShine/Code/Pipeline/LyShineBuilder/UiCanvasBuilderWorker.cpp b/Gems/LyShine/Code/Pipeline/LyShineBuilder/UiCanvasBuilderWorker.cpp
index f98ae0b489..51006f9c79 100644
--- a/Gems/LyShine/Code/Pipeline/LyShineBuilder/UiCanvasBuilderWorker.cpp
+++ b/Gems/LyShine/Code/Pipeline/LyShineBuilder/UiCanvasBuilderWorker.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
-
 #include <Pipeline/LyShineBuilder/UiCanvasBuilderWorker.h>
 
 #include <AssetBuilderSDK/SerializationDependencies.h>
diff --git a/Gems/LyShine/Code/Source/Animation/AnimNode.cpp b/Gems/LyShine/Code/Source/Animation/AnimNode.cpp
index b2c1142ef7..d75f881178 100644
--- a/Gems/LyShine/Code/Source/Animation/AnimNode.cpp
+++ b/Gems/LyShine/Code/Source/Animation/AnimNode.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "LyShine_precompiled.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include "AnimNode.h"
 #include "AnimTrack.h"
diff --git a/Gems/LyShine/Code/Source/Animation/AnimSequence.cpp b/Gems/LyShine/Code/Source/Animation/AnimSequence.cpp
index 9732e1729f..46cfa74e80 100644
--- a/Gems/LyShine/Code/Source/Animation/AnimSequence.cpp
+++ b/Gems/LyShine/Code/Source/Animation/AnimSequence.cpp
@@ -9,8 +9,6 @@
 // Description : Implementation of IAnimSequence interface.
 
 
-#include "LyShine_precompiled.h"
-
 #include "AnimSequence.h"
 
 #include "StlUtils.h"
diff --git a/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.cpp b/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.cpp
index b187198022..9ced74cd49 100644
--- a/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.cpp
+++ b/Gems/LyShine/Code/Source/Animation/AnimSplineTrack.cpp
@@ -6,6 +6,5 @@
  */
 
 
-#include "LyShine_precompiled.h"
 #include "AnimSplineTrack.h"
 
diff --git a/Gems/LyShine/Code/Source/Animation/AnimTrack.cpp b/Gems/LyShine/Code/Source/Animation/AnimTrack.cpp
index e9e2e77524..061cdc8bc0 100644
--- a/Gems/LyShine/Code/Source/Animation/AnimTrack.cpp
+++ b/Gems/LyShine/Code/Source/Animation/AnimTrack.cpp
@@ -6,5 +6,4 @@
  */
 
 
-#include "LyShine_precompiled.h"
 #include "AnimTrack.h"
diff --git a/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp b/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp
index 7e544545bc..ec2ba6be3d 100644
--- a/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp
+++ b/Gems/LyShine/Code/Source/Animation/AzEntityNode.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "LyShine_precompiled.h"
 #include "AzEntityNode.h"
 #include "AnimSplineTrack.h"
 #include "BoolTrack.h"
diff --git a/Gems/LyShine/Code/Source/Animation/BoolTrack.cpp b/Gems/LyShine/Code/Source/Animation/BoolTrack.cpp
index cb748c5e7e..ec37cab6e7 100644
--- a/Gems/LyShine/Code/Source/Animation/BoolTrack.cpp
+++ b/Gems/LyShine/Code/Source/Animation/BoolTrack.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "LyShine_precompiled.h"
 #include "BoolTrack.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include "UiAnimSerialize.h"
diff --git a/Gems/LyShine/Code/Source/Animation/CompoundSplineTrack.cpp b/Gems/LyShine/Code/Source/Animation/CompoundSplineTrack.cpp
index 1beb1170d0..1329802bb2 100644
--- a/Gems/LyShine/Code/Source/Animation/CompoundSplineTrack.cpp
+++ b/Gems/LyShine/Code/Source/Animation/CompoundSplineTrack.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "LyShine_precompiled.h"
 #include "CompoundSplineTrack.h"
 #include "AnimSplineTrack.h"
 
diff --git a/Gems/LyShine/Code/Source/Animation/EventNode.cpp b/Gems/LyShine/Code/Source/Animation/EventNode.cpp
index d0e49bceea..087fbe46b0 100644
--- a/Gems/LyShine/Code/Source/Animation/EventNode.cpp
+++ b/Gems/LyShine/Code/Source/Animation/EventNode.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "LyShine_precompiled.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include "EventNode.h"
 #include "AnimTrack.h"
diff --git a/Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h b/Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
deleted file mode 100644
index afd07aab98..0000000000
--- a/Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
+++ /dev/null
@@ -1,33 +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
- *
- */
-
-// LyShine_precompiled.h : include file for standard system include files,
-//  or project specific include files that are used frequently, but
-//      are changed infrequently
-//
-
-#ifndef LYSHINE_ANIMATION_LYSHINE_PRECOMPILED_H
-#define LYSHINE_ANIMATION_LYSHINE_PRECOMPILED_H
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#include <vector>
-#include <list>
-#include <map>
-#include <algorithm>
-
-#include <platform.h>
-
-#include <Cry_Math.h>
-#include <IXml.h>
-#include <ISystem.h>
-#include <LyShine/Animation/IUiAnimation.h>
-#include <smartptr.h>
-
-#endif
diff --git a/Gems/LyShine/Code/Source/Animation/TrackEventTrack.cpp b/Gems/LyShine/Code/Source/Animation/TrackEventTrack.cpp
index 154532868e..0b70d44b1f 100644
--- a/Gems/LyShine/Code/Source/Animation/TrackEventTrack.cpp
+++ b/Gems/LyShine/Code/Source/Animation/TrackEventTrack.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "LyShine_precompiled.h"
 #include "TrackEventTrack.h"
 
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/LyShine/Code/Source/Animation/UiAnimSerialize.cpp b/Gems/LyShine/Code/Source/Animation/UiAnimSerialize.cpp
index 8148ff9f3a..1a272e5009 100644
--- a/Gems/LyShine/Code/Source/Animation/UiAnimSerialize.cpp
+++ b/Gems/LyShine/Code/Source/Animation/UiAnimSerialize.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiAnimSerialize.h"
 
 #include <LyShine/UiBase.h>
diff --git a/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp b/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
index 527977ea44..cbdf178fd0 100644
--- a/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
+++ b/Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "LyShine_precompiled.h"
 #include "UiAnimationSystem.h"
 #include "AnimSplineTrack.h"
 #include "AnimSequence.h"
diff --git a/Gems/LyShine/Code/Source/Draw2d.cpp b/Gems/LyShine/Code/Source/Draw2d.cpp
index b4f2cc1672..825034a291 100644
--- a/Gems/LyShine/Code/Source/Draw2d.cpp
+++ b/Gems/LyShine/Code/Source/Draw2d.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "IFont.h"
 #include <IRenderer.h> // for SVF_P3F_C4B_T2F which will be removed in a coming PR
 
diff --git a/Gems/LyShine/Code/Source/EditorPropertyTypes.cpp b/Gems/LyShine/Code/Source/EditorPropertyTypes.cpp
index 967e048947..9a56fcd08c 100644
--- a/Gems/LyShine/Code/Source/EditorPropertyTypes.cpp
+++ b/Gems/LyShine/Code/Source/EditorPropertyTypes.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "EditorPropertyTypes.h"
 
 #include <LyShine/Bus/UiIndexableImageBus.h>
diff --git a/Gems/LyShine/Code/Source/LyShine.cpp b/Gems/LyShine/Code/Source/LyShine.cpp
index 9d22b75c86..1547b7e95b 100644
--- a/Gems/LyShine/Code/Source/LyShine.cpp
+++ b/Gems/LyShine/Code/Source/LyShine.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
-
 #include "LyShine.h"
 
 #include "UiCanvasComponent.h"
diff --git a/Gems/LyShine/Code/Source/LyShineDebug.cpp b/Gems/LyShine/Code/Source/LyShineDebug.cpp
index f28ea89fea..7f30d489b8 100644
--- a/Gems/LyShine/Code/Source/LyShineDebug.cpp
+++ b/Gems/LyShine/Code/Source/LyShineDebug.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "LyShineDebug.h"
 #include "IConsole.h"
 #include "IRenderer.h"
diff --git a/Gems/LyShine/Code/Source/LyShineDebug.h b/Gems/LyShine/Code/Source/LyShineDebug.h
index b0ee910ae0..581dc64ba6 100644
--- a/Gems/LyShine/Code/Source/LyShineDebug.h
+++ b/Gems/LyShine/Code/Source/LyShineDebug.h
@@ -12,6 +12,7 @@
 #include <Atom/RPI.Reflect/Image/Image.h>
 #include <AtomCore/Instance/Instance.h>
 
+#include <CryCommon/ISystem.h>
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp b/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp
index 82002fd131..e5ce7ec0d1 100644
--- a/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp
+++ b/Gems/LyShine/Code/Source/LyShineLoadScreen.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
 #include "LyShineLoadScreen.h"
 
 #if AZ_LOADSCREENCOMPONENT_ENABLED
diff --git a/Gems/LyShine/Code/Source/LyShineModule.cpp b/Gems/LyShine/Code/Source/LyShineModule.cpp
index 011bb9f203..bdcf762ba6 100644
--- a/Gems/LyShine/Code/Source/LyShineModule.cpp
+++ b/Gems/LyShine/Code/Source/LyShineModule.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
-
 #include "LyShineModule.h"
 #include "LyShineSystemComponent.h"
 #if defined(LYSHINE_EDITOR)
diff --git a/Gems/LyShine/Code/Source/LyShineSystemComponent.cpp b/Gems/LyShine/Code/Source/LyShineSystemComponent.cpp
index 7521c8b6c1..2c904b47c4 100644
--- a/Gems/LyShine/Code/Source/LyShineSystemComponent.cpp
+++ b/Gems/LyShine/Code/Source/LyShineSystemComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
-
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
diff --git a/Gems/LyShine/Code/Source/LyShine_precompiled.h b/Gems/LyShine/Code/Source/LyShine_precompiled.h
deleted file mode 100644
index 9b46d2024b..0000000000
--- a/Gems/LyShine/Code/Source/LyShine_precompiled.h
+++ /dev/null
@@ -1,14 +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 <platform.h> // Many CryCommon files require that this is included first.
-
-#include <algorithm>
-#include <ISystem.h>
-#include <LyShine/ILyShine.h>
diff --git a/Gems/LyShine/Code/Source/Particle/UiParticle.cpp b/Gems/LyShine/Code/Source/Particle/UiParticle.cpp
index ca28e60484..c840b34211 100644
--- a/Gems/LyShine/Code/Source/Particle/UiParticle.cpp
+++ b/Gems/LyShine/Code/Source/Particle/UiParticle.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiParticle.h"
 
 #include "UiParticleEmitterComponent.h"
diff --git a/Gems/LyShine/Code/Source/Platform/Common/Unimplemented/UiClipboard_Unimplemented.cpp b/Gems/LyShine/Code/Source/Platform/Common/Unimplemented/UiClipboard_Unimplemented.cpp
index 1493f1c1fe..ab9613b631 100644
--- a/Gems/LyShine/Code/Source/Platform/Common/Unimplemented/UiClipboard_Unimplemented.cpp
+++ b/Gems/LyShine/Code/Source/Platform/Common/Unimplemented/UiClipboard_Unimplemented.cpp
@@ -6,7 +6,6 @@
  */
 // UiClipboard is responsible setting and getting clipboard data for the UI elements in a platform-independent way.
 
-#include "LyShine_precompiled.h"
 #include "UiClipboard.h"
 #include <StringUtils.h>
 
diff --git a/Gems/LyShine/Code/Source/Platform/Windows/UiClipboard_Windows.cpp b/Gems/LyShine/Code/Source/Platform/Windows/UiClipboard_Windows.cpp
index dee73abc6d..a7a3f5ae06 100644
--- a/Gems/LyShine/Code/Source/Platform/Windows/UiClipboard_Windows.cpp
+++ b/Gems/LyShine/Code/Source/Platform/Windows/UiClipboard_Windows.cpp
@@ -6,7 +6,6 @@
  */
 // UiClipboard is responsible setting and getting clipboard data for the UI elements in a platform-independent way.
 
-#include "LyShine_precompiled.h"
 #include "UiClipboard.h"
 #include <AzCore/PlatformIncl.h>
 #include <StringUtils.h>
diff --git a/Gems/LyShine/Code/Source/RenderGraph.cpp b/Gems/LyShine/Code/Source/RenderGraph.cpp
index 5b33e59fdf..75d0564beb 100644
--- a/Gems/LyShine/Code/Source/RenderGraph.cpp
+++ b/Gems/LyShine/Code/Source/RenderGraph.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
-
 #include "RenderGraph.h"
 #include "UiRenderer.h"
 
diff --git a/Gems/LyShine/Code/Source/Script/UiCanvasLuaBus.cpp b/Gems/LyShine/Code/Source/Script/UiCanvasLuaBus.cpp
index a4f6348f9e..f359c6bd7b 100644
--- a/Gems/LyShine/Code/Source/Script/UiCanvasLuaBus.cpp
+++ b/Gems/LyShine/Code/Source/Script/UiCanvasLuaBus.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiCanvasLuaBus.h"
 #include "UiCanvasComponent.h"
 #include <LyShine/Bus/UiElementBus.h>
diff --git a/Gems/LyShine/Code/Source/Script/UiCanvasNotificationLuaBus.cpp b/Gems/LyShine/Code/Source/Script/UiCanvasNotificationLuaBus.cpp
index 6ff67725eb..7e0290a796 100644
--- a/Gems/LyShine/Code/Source/Script/UiCanvasNotificationLuaBus.cpp
+++ b/Gems/LyShine/Code/Source/Script/UiCanvasNotificationLuaBus.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiCanvasNotificationLuaBus.h"
 #include <LyShine/Bus/UiElementBus.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
diff --git a/Gems/LyShine/Code/Source/Script/UiElementLuaBus.cpp b/Gems/LyShine/Code/Source/Script/UiElementLuaBus.cpp
index ece750b5bf..e446938d55 100644
--- a/Gems/LyShine/Code/Source/Script/UiElementLuaBus.cpp
+++ b/Gems/LyShine/Code/Source/Script/UiElementLuaBus.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiElementLuaBus.h"
 #include <LyShine/Bus/UiElementBus.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
diff --git a/Gems/LyShine/Code/Source/Sprite.cpp b/Gems/LyShine/Code/Source/Sprite.cpp
index e2a20b00e3..7eb3f0fbf9 100644
--- a/Gems/LyShine/Code/Source/Sprite.cpp
+++ b/Gems/LyShine/Code/Source/Sprite.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "Sprite.h"
 #include <CryPath.h>
 #include <IRenderer.h>
diff --git a/Gems/LyShine/Code/Source/Tests/test_Main.cpp b/Gems/LyShine/Code/Source/Tests/test_Main.cpp
index 48f0065ba9..0c27491f8d 100644
--- a/Gems/LyShine/Code/Source/Tests/test_Main.cpp
+++ b/Gems/LyShine/Code/Source/Tests/test_Main.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include <AzTest/AzTest.h>
 
 AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV);
diff --git a/Gems/LyShine/Code/Source/TextMarkup.cpp b/Gems/LyShine/Code/Source/TextMarkup.cpp
index d2409a5f4e..36298ccc79 100644
--- a/Gems/LyShine/Code/Source/TextMarkup.cpp
+++ b/Gems/LyShine/Code/Source/TextMarkup.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "TextMarkup.h"
 #include <AzCore/std/containers/stack.h>
 #include <AzCore/std/string/conversions.h>
diff --git a/Gems/LyShine/Code/Source/UiButtonComponent.cpp b/Gems/LyShine/Code/Source/UiButtonComponent.cpp
index 75726da57f..078458023c 100644
--- a/Gems/LyShine/Code/Source/UiButtonComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiButtonComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiButtonComponent.h"
 #include "Sprite.h"
 
diff --git a/Gems/LyShine/Code/Source/UiCanvasComponent.cpp b/Gems/LyShine/Code/Source/UiCanvasComponent.cpp
index b3a26de98e..a3579da083 100644
--- a/Gems/LyShine/Code/Source/UiCanvasComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiCanvasComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiCanvasComponent.h"
 
 #include "UiElementComponent.h"
diff --git a/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp b/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp
index 993d29c1ae..9705fb66ed 100644
--- a/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp
+++ b/Gems/LyShine/Code/Source/UiCanvasFileObject.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiCanvasFileObject.h"
 #include "UiSerialize.h"
 #include <AzCore/Serialization/Utils.h>
diff --git a/Gems/LyShine/Code/Source/UiCanvasManager.cpp b/Gems/LyShine/Code/Source/UiCanvasManager.cpp
index 1b5cf2ebe7..405c44760f 100644
--- a/Gems/LyShine/Code/Source/UiCanvasManager.cpp
+++ b/Gems/LyShine/Code/Source/UiCanvasManager.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiCanvasManager.h"
 #include <LyShine/Draw2d.h>
 
diff --git a/Gems/LyShine/Code/Source/UiCheckboxComponent.cpp b/Gems/LyShine/Code/Source/UiCheckboxComponent.cpp
index cf0ed939ed..acd3beb86a 100644
--- a/Gems/LyShine/Code/Source/UiCheckboxComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiCheckboxComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiCheckboxComponent.h"
 #include "Sprite.h"
 
diff --git a/Gems/LyShine/Code/Source/UiDraggableComponent.cpp b/Gems/LyShine/Code/Source/UiDraggableComponent.cpp
index 55ddcf93e4..ab10fea029 100644
--- a/Gems/LyShine/Code/Source/UiDraggableComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiDraggableComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiDraggableComponent.h"
 
 #include <AzCore/Math/Crc.h>
diff --git a/Gems/LyShine/Code/Source/UiDropTargetComponent.cpp b/Gems/LyShine/Code/Source/UiDropTargetComponent.cpp
index 4110bb8aee..d918a579e2 100644
--- a/Gems/LyShine/Code/Source/UiDropTargetComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiDropTargetComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiDropTargetComponent.h"
 
 #include <AzCore/Math/Crc.h>
diff --git a/Gems/LyShine/Code/Source/UiDropdownComponent.cpp b/Gems/LyShine/Code/Source/UiDropdownComponent.cpp
index fb7885fd52..131afdf706 100644
--- a/Gems/LyShine/Code/Source/UiDropdownComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiDropdownComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiDropdownComponent.h"
 
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/LyShine/Code/Source/UiDropdownOptionComponent.cpp b/Gems/LyShine/Code/Source/UiDropdownOptionComponent.cpp
index 76ef210b4d..795def885c 100644
--- a/Gems/LyShine/Code/Source/UiDropdownOptionComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiDropdownOptionComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiDropdownOptionComponent.h"
 
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/LyShine/Code/Source/UiDynamicLayoutComponent.cpp b/Gems/LyShine/Code/Source/UiDynamicLayoutComponent.cpp
index d03842f9f0..73afc9ed39 100644
--- a/Gems/LyShine/Code/Source/UiDynamicLayoutComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiDynamicLayoutComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiDynamicLayoutComponent.h"
 
 #include "UiElementComponent.h"
diff --git a/Gems/LyShine/Code/Source/UiDynamicScrollBoxComponent.cpp b/Gems/LyShine/Code/Source/UiDynamicScrollBoxComponent.cpp
index 9e2f749aa2..2ad7e1204d 100644
--- a/Gems/LyShine/Code/Source/UiDynamicScrollBoxComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiDynamicScrollBoxComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiDynamicScrollBoxComponent.h"
 
 #include "UiElementComponent.h"
diff --git a/Gems/LyShine/Code/Source/UiElementComponent.cpp b/Gems/LyShine/Code/Source/UiElementComponent.cpp
index d335da2340..a4c7e971b6 100644
--- a/Gems/LyShine/Code/Source/UiElementComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiElementComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiElementComponent.h"
 
 #include <AzCore/Math/Crc.h>
diff --git a/Gems/LyShine/Code/Source/UiEntityContext.cpp b/Gems/LyShine/Code/Source/UiEntityContext.cpp
index 257ea21692..73692e3041 100644
--- a/Gems/LyShine/Code/Source/UiEntityContext.cpp
+++ b/Gems/LyShine/Code/Source/UiEntityContext.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
-
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Component/EntityUtils.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
diff --git a/Gems/LyShine/Code/Source/UiFaderComponent.cpp b/Gems/LyShine/Code/Source/UiFaderComponent.cpp
index 08f6c89b3a..8fb460d8b5 100644
--- a/Gems/LyShine/Code/Source/UiFaderComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiFaderComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiFaderComponent.h"
 #include <LyShine/Draw2d.h>
 
diff --git a/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp b/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp
index 0444595c90..86ba103e49 100644
--- a/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
-
 #include "UiFlipbookAnimationComponent.h"
 
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/LyShine/Code/Source/UiGameEntityContext.cpp b/Gems/LyShine/Code/Source/UiGameEntityContext.cpp
index 82fcf31c4c..35b8bed30a 100644
--- a/Gems/LyShine/Code/Source/UiGameEntityContext.cpp
+++ b/Gems/LyShine/Code/Source/UiGameEntityContext.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
-
 #include "UiGameEntityContext.h"
 #include <AzCore/Serialization/Utils.h>
 #include <LyShine/Bus/UiCanvasBus.h>
diff --git a/Gems/LyShine/Code/Source/UiImageComponent.cpp b/Gems/LyShine/Code/Source/UiImageComponent.cpp
index 90a57e1108..bf117a6d0f 100644
--- a/Gems/LyShine/Code/Source/UiImageComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiImageComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiImageComponent.h"
 
 #include <AzCore/Math/Crc.h>
diff --git a/Gems/LyShine/Code/Source/UiImageSequenceComponent.cpp b/Gems/LyShine/Code/Source/UiImageSequenceComponent.cpp
index 87859ae4c9..8a8259a0bd 100644
--- a/Gems/LyShine/Code/Source/UiImageSequenceComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiImageSequenceComponent.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
-
 #include "UiImageSequenceComponent.h"
 #include "Sprite.h"
 #include "RenderGraph.h"
diff --git a/Gems/LyShine/Code/Source/UiInteractableComponent.cpp b/Gems/LyShine/Code/Source/UiInteractableComponent.cpp
index 0be1e5966c..a5d10980fd 100644
--- a/Gems/LyShine/Code/Source/UiInteractableComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiInteractableComponent.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
 #include "UiInteractableComponent.h"
 
 #include <AzCore/Math/Crc.h>
diff --git a/Gems/LyShine/Code/Source/UiInteractableState.cpp b/Gems/LyShine/Code/Source/UiInteractableState.cpp
index 0d6334c108..af7c788781 100644
--- a/Gems/LyShine/Code/Source/UiInteractableState.cpp
+++ b/Gems/LyShine/Code/Source/UiInteractableState.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
 #include "UiInteractableState.h"
 
 #include <AzCore/Math/Crc.h>
@@ -21,6 +20,7 @@
 #include <LyShine/Bus/UiElementBus.h>
 #include <LyShine/Bus/UiVisualBus.h>
 #include <LyShine/Bus/UiIndexableImageBus.h>
+#include <CryCommon/LyShine/ILyShine.h>
 
 #include <IRenderer.h>
 #include "EditorPropertyTypes.h"
diff --git a/Gems/LyShine/Code/Source/UiLayoutCellComponent.cpp b/Gems/LyShine/Code/Source/UiLayoutCellComponent.cpp
index 38636abdb2..610d06d5ad 100644
--- a/Gems/LyShine/Code/Source/UiLayoutCellComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiLayoutCellComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiLayoutCellComponent.h"
 
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/LyShine/Code/Source/UiLayoutColumnComponent.cpp b/Gems/LyShine/Code/Source/UiLayoutColumnComponent.cpp
index b999adb3c1..d8506456f0 100644
--- a/Gems/LyShine/Code/Source/UiLayoutColumnComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiLayoutColumnComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiLayoutColumnComponent.h"
 
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/LyShine/Code/Source/UiLayoutFitterComponent.cpp b/Gems/LyShine/Code/Source/UiLayoutFitterComponent.cpp
index bf05d172c0..3dbcfa12d2 100644
--- a/Gems/LyShine/Code/Source/UiLayoutFitterComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiLayoutFitterComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiLayoutFitterComponent.h"
 #include "UiLayoutHelpers.h"
 
diff --git a/Gems/LyShine/Code/Source/UiLayoutGridComponent.cpp b/Gems/LyShine/Code/Source/UiLayoutGridComponent.cpp
index 155c78b417..b5366826fb 100644
--- a/Gems/LyShine/Code/Source/UiLayoutGridComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiLayoutGridComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiLayoutGridComponent.h"
 
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/LyShine/Code/Source/UiLayoutHelpers.cpp b/Gems/LyShine/Code/Source/UiLayoutHelpers.cpp
index cbe94674bb..3bfad4ab32 100644
--- a/Gems/LyShine/Code/Source/UiLayoutHelpers.cpp
+++ b/Gems/LyShine/Code/Source/UiLayoutHelpers.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiLayoutHelpers.h"
 
 #include <LyShine/Bus/UiElementBus.h>
diff --git a/Gems/LyShine/Code/Source/UiLayoutManager.cpp b/Gems/LyShine/Code/Source/UiLayoutManager.cpp
index d7f31b3b4f..cac5359df0 100644
--- a/Gems/LyShine/Code/Source/UiLayoutManager.cpp
+++ b/Gems/LyShine/Code/Source/UiLayoutManager.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiLayoutManager.h"
 
 #include <LyShine/Bus/UiLayoutBus.h>
diff --git a/Gems/LyShine/Code/Source/UiLayoutRowComponent.cpp b/Gems/LyShine/Code/Source/UiLayoutRowComponent.cpp
index 01deeff75f..93e97de1b5 100644
--- a/Gems/LyShine/Code/Source/UiLayoutRowComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiLayoutRowComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiLayoutRowComponent.h"
 
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/LyShine/Code/Source/UiMarkupButtonComponent.cpp b/Gems/LyShine/Code/Source/UiMarkupButtonComponent.cpp
index 2df04e2fec..75922fe3fc 100644
--- a/Gems/LyShine/Code/Source/UiMarkupButtonComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiMarkupButtonComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiMarkupButtonComponent.h"
 
 #include <LyShine/Bus/UiCanvasBus.h>
diff --git a/Gems/LyShine/Code/Source/UiMaskComponent.cpp b/Gems/LyShine/Code/Source/UiMaskComponent.cpp
index 1c1327ee34..cc35c1b950 100644
--- a/Gems/LyShine/Code/Source/UiMaskComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiMaskComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiMaskComponent.h"
 #include <LyShine/Draw2d.h>
 
diff --git a/Gems/LyShine/Code/Source/UiNavigationHelpers.cpp b/Gems/LyShine/Code/Source/UiNavigationHelpers.cpp
index d25b5a2fb1..7e749541a5 100644
--- a/Gems/LyShine/Code/Source/UiNavigationHelpers.cpp
+++ b/Gems/LyShine/Code/Source/UiNavigationHelpers.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiNavigationHelpers.h"
 
 #include <LyShine/Bus/UiElementBus.h>
diff --git a/Gems/LyShine/Code/Source/UiNavigationHelpers.h b/Gems/LyShine/Code/Source/UiNavigationHelpers.h
index 231ead6fd1..66f31bef8a 100644
--- a/Gems/LyShine/Code/Source/UiNavigationHelpers.h
+++ b/Gems/LyShine/Code/Source/UiNavigationHelpers.h
@@ -8,6 +8,7 @@
 
 #include <LyShine/Bus/UiTransformBus.h>
 #include <AzFramework/Input/Channels/InputChannelDigitalWithSharedModifierKeyStates.h>
+#include <CryCommon/LyShine/UiBase.h>
 
 namespace AzFramework
 {
diff --git a/Gems/LyShine/Code/Source/UiNavigationSettings.cpp b/Gems/LyShine/Code/Source/UiNavigationSettings.cpp
index ff50a70c9d..8733a2f21d 100644
--- a/Gems/LyShine/Code/Source/UiNavigationSettings.cpp
+++ b/Gems/LyShine/Code/Source/UiNavigationSettings.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiNavigationSettings.h"
 
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/LyShine/Code/Source/UiNavigationSettings.h b/Gems/LyShine/Code/Source/UiNavigationSettings.h
index a9ce84a53b..aace035b9a 100644
--- a/Gems/LyShine/Code/Source/UiNavigationSettings.h
+++ b/Gems/LyShine/Code/Source/UiNavigationSettings.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <LyShine/Bus/UiNavigationBus.h>
+#include <CryCommon/LyShine/UiBase.h>
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 class UiNavigationSettings
diff --git a/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp b/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp
index 391b110314..e89d07b7ab 100644
--- a/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiParticleEmitterComponent.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
-
 #include "UiParticleEmitterComponent.h"
 #include "EditorPropertyTypes.h"
 #include "Sprite.h"
diff --git a/Gems/LyShine/Code/Source/UiRadioButtonComponent.cpp b/Gems/LyShine/Code/Source/UiRadioButtonComponent.cpp
index c0bb3557f9..53cb58ff74 100644
--- a/Gems/LyShine/Code/Source/UiRadioButtonComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiRadioButtonComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiRadioButtonComponent.h"
 #include "UiRadioButtonGroupComponent.h"
 
diff --git a/Gems/LyShine/Code/Source/UiRadioButtonGroupComponent.cpp b/Gems/LyShine/Code/Source/UiRadioButtonGroupComponent.cpp
index e65f67eb93..775b731c71 100644
--- a/Gems/LyShine/Code/Source/UiRadioButtonGroupComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiRadioButtonGroupComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiRadioButtonGroupComponent.h"
 
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/LyShine/Code/Source/UiRenderer.cpp b/Gems/LyShine/Code/Source/UiRenderer.cpp
index a8285c1343..af498517c5 100644
--- a/Gems/LyShine/Code/Source/UiRenderer.cpp
+++ b/Gems/LyShine/Code/Source/UiRenderer.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiRenderer.h"
 
 #include <Atom/RPI.Public/Image/ImageSystemInterface.h>
diff --git a/Gems/LyShine/Code/Source/UiRenderer.h b/Gems/LyShine/Code/Source/UiRenderer.h
index 018e60350e..29c1002a6d 100644
--- a/Gems/LyShine/Code/Source/UiRenderer.h
+++ b/Gems/LyShine/Code/Source/UiRenderer.h
@@ -6,6 +6,8 @@
  */
 #pragma once
 
+#include <CryCommon/BaseTypes.h>
+
 #include <Atom/RPI.Public/DynamicDraw/DynamicDrawContext.h>
 #include <Atom/RPI.Public/WindowContext.h>
 #include <Atom/RPI.Public/ViewportContext.h>
diff --git a/Gems/LyShine/Code/Source/UiScrollBarComponent.cpp b/Gems/LyShine/Code/Source/UiScrollBarComponent.cpp
index f8b73a2647..d1f5b95d1f 100644
--- a/Gems/LyShine/Code/Source/UiScrollBarComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiScrollBarComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiScrollBarComponent.h"
 
 #include "UiNavigationHelpers.h"
diff --git a/Gems/LyShine/Code/Source/UiScrollBoxComponent.cpp b/Gems/LyShine/Code/Source/UiScrollBoxComponent.cpp
index 1530d2f7a3..4a5ada0409 100644
--- a/Gems/LyShine/Code/Source/UiScrollBoxComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiScrollBoxComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiScrollBoxComponent.h"
 #include "Sprite.h"
 
diff --git a/Gems/LyShine/Code/Source/UiSerialize.cpp b/Gems/LyShine/Code/Source/UiSerialize.cpp
index 639821930a..2b3c5806dd 100644
--- a/Gems/LyShine/Code/Source/UiSerialize.cpp
+++ b/Gems/LyShine/Code/Source/UiSerialize.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiSerialize.h"
 
 #include <LyShine/UiAssetTypes.h>
diff --git a/Gems/LyShine/Code/Source/UiSliderComponent.cpp b/Gems/LyShine/Code/Source/UiSliderComponent.cpp
index b20505460e..2d03ed8a02 100644
--- a/Gems/LyShine/Code/Source/UiSliderComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiSliderComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiSliderComponent.h"
 #include "Sprite.h"
 
diff --git a/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp b/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp
index e8387e2392..dcfd82256b 100644
--- a/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiSpawnerComponent.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
-
 #include "UiSpawnerComponent.h"
 
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/LyShine/Code/Source/UiStateActionManager.cpp b/Gems/LyShine/Code/Source/UiStateActionManager.cpp
index 0960e92f50..9a30f8ad67 100644
--- a/Gems/LyShine/Code/Source/UiStateActionManager.cpp
+++ b/Gems/LyShine/Code/Source/UiStateActionManager.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
 #include "UiStateActionManager.h"
 
 #include <LyShine/Bus/UiVisualBus.h>
diff --git a/Gems/LyShine/Code/Source/UiTextComponent.cpp b/Gems/LyShine/Code/Source/UiTextComponent.cpp
index b219856a8b..b7ee94a061 100644
--- a/Gems/LyShine/Code/Source/UiTextComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiTextComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiTextComponent.h"
 
 #include <AzCore/Math/Crc.h>
diff --git a/Gems/LyShine/Code/Source/UiTextComponentOffsetsSelector.cpp b/Gems/LyShine/Code/Source/UiTextComponentOffsetsSelector.cpp
index 60f9453290..07796567bd 100644
--- a/Gems/LyShine/Code/Source/UiTextComponentOffsetsSelector.cpp
+++ b/Gems/LyShine/Code/Source/UiTextComponentOffsetsSelector.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiTextComponentOffsetsSelector.h"
 #include "StringUtfUtils.h"
 
diff --git a/Gems/LyShine/Code/Source/UiTextInputComponent.cpp b/Gems/LyShine/Code/Source/UiTextInputComponent.cpp
index 095fe205d2..4d2c0f9e13 100644
--- a/Gems/LyShine/Code/Source/UiTextInputComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiTextInputComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiTextInputComponent.h"
 
 #include <AzCore/Math/Crc.h>
diff --git a/Gems/LyShine/Code/Source/UiTooltipComponent.cpp b/Gems/LyShine/Code/Source/UiTooltipComponent.cpp
index 967f26edc1..ab5d6917c3 100644
--- a/Gems/LyShine/Code/Source/UiTooltipComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiTooltipComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiTooltipComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.cpp b/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.cpp
index 41a6888190..89c73beb7a 100644
--- a/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiTooltipDisplayComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiTooltipDisplayComponent.h"
 
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/LyShine/Code/Source/UiTransform2dComponent.cpp b/Gems/LyShine/Code/Source/UiTransform2dComponent.cpp
index 9912791930..c319fa7037 100644
--- a/Gems/LyShine/Code/Source/UiTransform2dComponent.cpp
+++ b/Gems/LyShine/Code/Source/UiTransform2dComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiTransform2dComponent.h"
 
 #include <AzCore/Math/Crc.h>
diff --git a/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp b/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
index 2db56b174a..8a7bc89312 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasAssetRefComponent.cpp
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiCanvasAssetRefComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <LyShine/Bus/UiCanvasBus.h>
 #include <LyShine/LyShineBus.h>
+#include <CryCommon/LyShine/ILyShine.h>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //! UiCanvasAssetRefNotificationBus Behavior context handler class
diff --git a/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp b/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp
index 320fe47745..b5b0824949 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasOnMeshComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiCanvasOnMeshComponent.h"
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp b/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp
index 4fe2ccd42e..a86a361578 100644
--- a/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp
+++ b/Gems/LyShine/Code/Source/World/UiCanvasProxyRefComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "UiCanvasProxyRefComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/LyShine/Code/Tests/AnimationTest.cpp b/Gems/LyShine/Code/Tests/AnimationTest.cpp
index dab298f112..f339be84aa 100644
--- a/Gems/LyShine/Code/Tests/AnimationTest.cpp
+++ b/Gems/LyShine/Code/Tests/AnimationTest.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
-
 #include "LyShineTest.h"
 #include <Mocks/ISystemMock.h>
 #include <Mocks/ITimerMock.h>
diff --git a/Gems/LyShine/Code/Tests/LyShineEditorTest.cpp b/Gems/LyShine/Code/Tests/LyShineEditorTest.cpp
index 88a201231c..58ce2eb6dc 100644
--- a/Gems/LyShine/Code/Tests/LyShineEditorTest.cpp
+++ b/Gems/LyShine/Code/Tests/LyShineEditorTest.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
 #include <AzTest/AzTest.h>
 #include <AzTest/Utils.h>
 #include <CryCommon/Mocks/ISystemMock.h>
diff --git a/Gems/LyShine/Code/Tests/SerializationTest.cpp b/Gems/LyShine/Code/Tests/SerializationTest.cpp
index 1d8b1094d2..1b2bec64a6 100644
--- a/Gems/LyShine/Code/Tests/SerializationTest.cpp
+++ b/Gems/LyShine/Code/Tests/SerializationTest.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
-
 #include "LyShineTest.h"
 #include <UiSerialize.h>
 
diff --git a/Gems/LyShine/Code/Tests/SpriteTest.cpp b/Gems/LyShine/Code/Tests/SpriteTest.cpp
index 4a97851d21..7c14af55be 100644
--- a/Gems/LyShine/Code/Tests/SpriteTest.cpp
+++ b/Gems/LyShine/Code/Tests/SpriteTest.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
-
 #include "LyShineTest.h"
 #include <Mocks/ISystemMock.h>
 #include <Mocks/IRendererMock.h>
diff --git a/Gems/LyShine/Code/Tests/TextInputComponentTest.cpp b/Gems/LyShine/Code/Tests/TextInputComponentTest.cpp
index 1b46576195..d83715f78d 100644
--- a/Gems/LyShine/Code/Tests/TextInputComponentTest.cpp
+++ b/Gems/LyShine/Code/Tests/TextInputComponentTest.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
 #include "LyShineTest.h"
 
 #include <Mocks/IRendererMock.h>
diff --git a/Gems/LyShine/Code/Tests/UiDynamicScrollBoxComponentTest.cpp b/Gems/LyShine/Code/Tests/UiDynamicScrollBoxComponentTest.cpp
index c4d0177f2a..6dc22217cf 100644
--- a/Gems/LyShine/Code/Tests/UiDynamicScrollBoxComponentTest.cpp
+++ b/Gems/LyShine/Code/Tests/UiDynamicScrollBoxComponentTest.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
 #include "LyShineTest.h"
 
 #include "UiGameEntityContext.h"
diff --git a/Gems/LyShine/Code/Tests/UiScrollBarComponentTest.cpp b/Gems/LyShine/Code/Tests/UiScrollBarComponentTest.cpp
index 601906ecdb..1f5e77e90f 100644
--- a/Gems/LyShine/Code/Tests/UiScrollBarComponentTest.cpp
+++ b/Gems/LyShine/Code/Tests/UiScrollBarComponentTest.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "LyShine_precompiled.h"
 #include "LyShineTest.h"
 
 #include "UiGameEntityContext.h"
diff --git a/Gems/LyShine/Code/Tests/UiTooltipComponentTest.cpp b/Gems/LyShine/Code/Tests/UiTooltipComponentTest.cpp
index 76962fd318..69a6af2dc5 100644
--- a/Gems/LyShine/Code/Tests/UiTooltipComponentTest.cpp
+++ b/Gems/LyShine/Code/Tests/UiTooltipComponentTest.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "LyShine_precompiled.h"
 #include "LyShineTest.h"
 #include <ISerialize.h>
 #include "UiGameEntityContext.h"
diff --git a/Gems/LyShine/Code/lyshine_static_files.cmake b/Gems/LyShine/Code/lyshine_static_files.cmake
index 8c2275ab92..39af6ec13e 100644
--- a/Gems/LyShine/Code/lyshine_static_files.cmake
+++ b/Gems/LyShine/Code/lyshine_static_files.cmake
@@ -12,7 +12,6 @@ set(FILES
     Source/LyShine.h
     Source/LyShineDebug.cpp
     Source/LyShineDebug.h
-    Source/LyShine_precompiled.h
     Source/StringUtfUtils.h
     Source/UiImageComponent.cpp
     Source/UiImageComponent.h