diff --git a/Code/Editor/StringDlg.h b/Code/Editor/StringDlg.h
index 4fb69e40a7..eec77b158c 100644
--- a/Code/Editor/StringDlg.h
+++ b/Code/Editor/StringDlg.h
@@ -13,6 +13,7 @@
 
 #include <QInputDialog>
 #include <QMessageBox>
+#include <SandboxAPI.h>
 
 /////////////////////////////////////////////////////////////////////////////
 // StringDlg Qt dialog
diff --git a/Gems/LyShine/Code/Editor/AlignToolbarSection.cpp b/Gems/LyShine/Code/Editor/AlignToolbarSection.cpp
index e179948961..71df423677 100644
--- a/Gems/LyShine/Code/Editor/AlignToolbarSection.cpp
+++ b/Gems/LyShine/Code/Editor/AlignToolbarSection.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "AlignToolbarSection.h"
 #include "ViewportAlign.h"
diff --git a/Gems/LyShine/Code/Editor/AnchorPresets.cpp b/Gems/LyShine/Code/Editor/AnchorPresets.cpp
index edb5de41b2..485b01148f 100644
--- a/Gems/LyShine/Code/Editor/AnchorPresets.cpp
+++ b/Gems/LyShine/Code/Editor/AnchorPresets.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "AnchorPresets.h"
 
 namespace
diff --git a/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp b/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp
index 1aa9ed7e55..bcfad1aaff 100644
--- a/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp
+++ b/Gems/LyShine/Code/Editor/AnchorPresetsWidget.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "PresetButton.h"
 #include "AnchorPresets.h"
 #include "AnchorPresetsWidget.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/AnimationContext.cpp b/Gems/LyShine/Code/Editor/Animation/AnimationContext.cpp
index 975b54e998..71338dcc44 100644
--- a/Gems/LyShine/Code/Editor/Animation/AnimationContext.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/AnimationContext.cpp
@@ -6,8 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorDefs.h"
 #include "UiEditorAnimationBus.h"
 
diff --git a/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp b/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp
index 6bf3b2b440..667346a00b 100644
--- a/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "EditorCommon.h"
 #include <Animation/Controls/UiSplineCtrlEx.h>
 #include <Editor/Resource.h>
diff --git a/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.h b/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.h
index dfb1ea3ad7..7152a2ab18 100644
--- a/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.h
+++ b/Gems/LyShine/Code/Editor/Animation/Controls/UiSplineCtrlEx.h
@@ -16,6 +16,7 @@
 #include "../UiAnimUndoObject.h"
 
 #include <LyShine/Animation/IUiAnimation.h>
+#include <Util/EditorUtils.h>
 
 #include <QWidget>
 #endif
diff --git a/Gems/LyShine/Code/Editor/Animation/Controls/UiTimelineCtrl.cpp b/Gems/LyShine/Code/Editor/Animation/Controls/UiTimelineCtrl.cpp
index 0e860940b9..c975744c41 100644
--- a/Gems/LyShine/Code/Editor/Animation/Controls/UiTimelineCtrl.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/Controls/UiTimelineCtrl.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include <Animation/Controls/UiTimelineCtrl.h>
 #include "EditorDefs.h"
 //#include "MemDC.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.cpp b/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.cpp
index b47e36dd5d..83eb524ee6 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAVCustomizeTrackColorsDlg.cpp
@@ -6,8 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
-
 
 //----- UI_ANIMATION_REVISIT - this is required to compile since something we include still uses MFC
 
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.cpp b/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.cpp
index 3b9f2b6264..9371143c12 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAVEventsDialog.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiAVEventsDialog.h"
 #include <Editor/Animation/ui_UiAVEventsDialog.h>
 #include "UiAnimViewUndo.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.cpp b/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.cpp
index 5dd3c267a3..cf80fe7b4d 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiAVSequenceProps.h"
 #include <LyShine/Animation/IUiAnimation.h>
 #include "UiEditorAnimationBus.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.h b/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.h
index 0ffc2854e0..7f02103e8e 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAVSequenceProps.h
@@ -12,6 +12,7 @@
 class CUiAnimViewSequence;
 
 #if !defined(Q_MOC_RUN)
+#include <AzCore/PlatformIncl.h>
 #include <QDialog>
 #include <QScopedPointer>
 #endif
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAVTrackEventKeyUIControls.cpp b/Gems/LyShine/Code/Editor/Animation/UiAVTrackEventKeyUIControls.cpp
index 32ae244eda..13a2b5a1f1 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAVTrackEventKeyUIControls.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAVTrackEventKeyUIControls.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiAVTrackEventKeyUIControls.h"
 #include "UiAVEventsDialog.h"
 #include "UiAnimViewSequence.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimUndo.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimUndo.cpp
index 46bc7155d0..66bdb3c2c6 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimUndo.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimUndo.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "UiAnimUndo.h"
 #include "UiAnimUndoManager.h"
 
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.cpp
index a51f454fd3..04fbb45ae1 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiAnimUndoManager.h"
 #include "UiAnimUndoObject.h"
 #include "Undo/IUndoManagerListener.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.h b/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.h
index fbf058cea2..2bd3a1edd8 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimUndoManager.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include <AzCore/std/string/string.h>
+#include <AzCore/std/containers/vector.h>
 
 struct UiAnimUndoObject;
 class UiAnimUndoStep;
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.cpp
index 65b3260784..15d1eae8ea 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiEditorAnimationBus.h"
 #include "UiEditorDLLBus.h"
 #include "UiAnimViewAnimNode.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.h
index de46e42943..caad7e9b8c 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewAnimNode.h
@@ -15,6 +15,7 @@
 
 class CUiAnimViewAnimNode;
 class CEntityObject;
+class QWidget;
 
 namespace AZ
 {
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewCurveEditor.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewCurveEditor.cpp
index c3acd176a0..f88b724b23 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewCurveEditor.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewCurveEditor.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "EditorDefs.h"
 #include "Resource.h"
 #include "UiEditorAnimationBus.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp
index 6c6aa93055..86935a536f 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDialog.cpp
@@ -6,8 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
-
 //----- UI_ANIMATION_REVISIT - this is required to compile since something we include still uses MFC
 
 // prevent inclusion of conflicting definitions of INT8_MIN etc
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp
index 2dceb0416b..48a0d111bc 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "EditorDefs.h"
 #include "Resource.h"
 #include "UiEditorAnimationBus.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewEventNode.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewEventNode.cpp
index 72d99bd239..d6d4c4c096 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewEventNode.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewEventNode.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiAnimViewEventNode.h"
 #include "UiAnimViewSequence.h"
 
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewFindDlg.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewFindDlg.cpp
index 2f681fa14c..dcb24c1dc2 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewFindDlg.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewFindDlg.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "EditorDefs.h"
 #include "UiAnimViewFindDlg.h"
 #include "UiAnimViewDialog.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewKeyPropertiesDlg.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewKeyPropertiesDlg.cpp
index d04f9b2be0..225a25d86c 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewKeyPropertiesDlg.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewKeyPropertiesDlg.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiEditorAnimationBus.h"
 #include "EditorDefs.h"
 #include "UiAnimViewKeyPropertiesDlg.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNewSequenceDialog.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNewSequenceDialog.cpp
index 7ecce21b13..203389bc98 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNewSequenceDialog.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNewSequenceDialog.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiAnimViewNewSequenceDialog.h"
 #include "Animation/UiAnimViewSequenceManager.h"
 #include <Editor/Animation/ui_UiAnimViewNewSequenceDialog.h>
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNode.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNode.cpp
index f7146ccd2c..96c51bab2a 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNode.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNode.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiAnimViewAnimNode.h"
 #include "UiAnimViewTrack.h"
 #include "UiAnimViewSequence.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodeFactories.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodeFactories.cpp
index fc42af9450..332bd6d17b 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodeFactories.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodeFactories.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiAnimViewNodeFactories.h"
 #include "UiAnimViewAnimNode.h"
 #include "UiAnimViewEventNode.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.cpp
index 78ff4bee1f..e912b3db0e 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewNodes.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "EditorDefs.h"
 #include "Resource.h"
 #include "UiEditorAnimationBus.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequence.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequence.cpp
index f6bbab8789..86dd4a45c1 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequence.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequence.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiEditorAnimationBus.h"
 #include "UiAnimViewSequence.h"
 #include "UiAnimViewSequenceManager.h"
@@ -22,6 +21,7 @@
 #include "Clipboard.h"
 
 #include "UiEditorAnimationBus.h"
+#include <Util/EditorUtils.h>
 
 #include <QApplication>
 
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.cpp
index 1cca7fed4e..bac67c6137 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSequenceManager.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiEditorAnimationBus.h"
 #include "UiEditorDLLBus.h"
 #include "UiAnimViewSequenceManager.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplineCtrl.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplineCtrl.cpp
index 3f4b21a93c..86bbb0fa2c 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplineCtrl.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplineCtrl.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiEditorAnimationBus.h"
 #include "EditorDefs.h"
 #include "Resource.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplitter.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplitter.cpp
index f1f859a933..21f4b5fb27 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplitter.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewSplitter.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiAnimViewSplitter.h"
 
 
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewTrack.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewTrack.cpp
index d9375c8cae..6bf557a7d9 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewTrack.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewTrack.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiAnimViewTrack.h"
 #include "UiAnimViewAnimNode.h"
 #include "UiAnimViewSequence.h"
@@ -15,6 +14,8 @@
 
 #include "UiEditorAnimationBus.h"
 
+#include <Util/EditorUtils.h>
+
 //////////////////////////////////////////////////////////////////////////
 void CUiAnimViewTrackBundle::AppendTrack(CUiAnimViewTrack* pTrack)
 {
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.cpp b/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.cpp
index 4448cd9fc4..a9aa2037ca 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.cpp
@@ -6,7 +6,6 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 #include "UiAnimViewUndo.h"
 #include "UiAnimViewSequenceManager.h"
 #include "UiAnimViewSequence.h"
diff --git a/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.h b/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.h
index b86dafe1ef..d18a23f2e5 100644
--- a/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.h
+++ b/Gems/LyShine/Code/Editor/Animation/UiAnimViewUndo.h
@@ -14,6 +14,10 @@
 #include "UiAnimUndoObject.h"
 #include "UiAnimUndo.h"
 
+#include <QtCore/QString>
+
+class QWidget;
+
 class CUiAnimViewNode;
 class CUiAnimViewSequence;
 class CUiAnimViewAnimNode;
diff --git a/Gems/LyShine/Code/Editor/Animation/Util/UiEditorUtils.cpp b/Gems/LyShine/Code/Editor/Animation/Util/UiEditorUtils.cpp
index f3c3746034..67e21dd5ce 100644
--- a/Gems/LyShine/Code/Editor/Animation/Util/UiEditorUtils.cpp
+++ b/Gems/LyShine/Code/Editor/Animation/Util/UiEditorUtils.cpp
@@ -6,9 +6,10 @@
  */
 
 
-#include "UiCanvasEditor_precompiled.h"
 //#include "CustomizeKeyboardPage.h"
 
+#include <Util/EditorUtils.h>
+
 #include <Editor/Resource.h>
 
 #include <QColor>
diff --git a/Gems/LyShine/Code/Editor/AssetDropHelpers.cpp b/Gems/LyShine/Code/Editor/AssetDropHelpers.cpp
index 60bc816d35..c9a78c276c 100644
--- a/Gems/LyShine/Code/Editor/AssetDropHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/AssetDropHelpers.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "AssetDropHelpers.h"
 #include <LyShine/UiAssetTypes.h>
 #include <AzCore/Asset/AssetTypeInfoBus.h>
diff --git a/Gems/LyShine/Code/Editor/AssetTreeEntry.cpp b/Gems/LyShine/Code/Editor/AssetTreeEntry.cpp
index 63b9b81d6c..ecc3ba893e 100644
--- a/Gems/LyShine/Code/Editor/AssetTreeEntry.cpp
+++ b/Gems/LyShine/Code/Editor/AssetTreeEntry.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "AssetTreeEntry.h"
 #include "EditorCommon.h"
 
diff --git a/Gems/LyShine/Code/Editor/CanvasHelpers.cpp b/Gems/LyShine/Code/Editor/CanvasHelpers.cpp
index 445e587ce7..36eb5c2b74 100644
--- a/Gems/LyShine/Code/Editor/CanvasHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/CanvasHelpers.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include <LyShine/Bus/UiEditorCanvasBus.h>
 
diff --git a/Gems/LyShine/Code/Editor/CanvasSizeToolbarSection.cpp b/Gems/LyShine/Code/Editor/CanvasSizeToolbarSection.cpp
index 70a77f9b57..12cb4f5cf4 100644
--- a/Gems/LyShine/Code/Editor/CanvasSizeToolbarSection.cpp
+++ b/Gems/LyShine/Code/Editor/CanvasSizeToolbarSection.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "CommandCanvasSize.h"
 
@@ -16,6 +14,8 @@
 #include <QJsonArray>
 #include <QTextStream>
 #include <QLabel>
+#include <QFile>
+#include <QDir>
 
 namespace
 {
diff --git a/Gems/LyShine/Code/Editor/CommandCanvasPropertiesChange.cpp b/Gems/LyShine/Code/Editor/CommandCanvasPropertiesChange.cpp
index 9dc2b5efce..2c4310d260 100644
--- a/Gems/LyShine/Code/Editor/CommandCanvasPropertiesChange.cpp
+++ b/Gems/LyShine/Code/Editor/CommandCanvasPropertiesChange.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 CommandCanvasPropertiesChange::CommandCanvasPropertiesChange(UndoStack* stack,
diff --git a/Gems/LyShine/Code/Editor/CommandCanvasSize.cpp b/Gems/LyShine/Code/Editor/CommandCanvasSize.cpp
index 27845095ee..49fac81f63 100644
--- a/Gems/LyShine/Code/Editor/CommandCanvasSize.cpp
+++ b/Gems/LyShine/Code/Editor/CommandCanvasSize.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "CommandCanvasSize.h"
 
diff --git a/Gems/LyShine/Code/Editor/CommandCanvasSizeToolbarIndex.cpp b/Gems/LyShine/Code/Editor/CommandCanvasSizeToolbarIndex.cpp
index 4b70f14699..8d648cdfe5 100644
--- a/Gems/LyShine/Code/Editor/CommandCanvasSizeToolbarIndex.cpp
+++ b/Gems/LyShine/Code/Editor/CommandCanvasSizeToolbarIndex.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 CommandCanvasSizeToolbarIndex::CommandCanvasSizeToolbarIndex(UndoStack* stack,
diff --git a/Gems/LyShine/Code/Editor/CommandHierarchyItemCreate.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemCreate.cpp
index 56a85bc865..d283f8a224 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemCreate.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemCreate.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #define UICANVASEDITOR_ELEMENT_NAME_DEFAULT     "Element"
diff --git a/Gems/LyShine/Code/Editor/CommandHierarchyItemCreateFromData.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemCreateFromData.cpp
index 0ea9469704..afb6d5acba 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemCreateFromData.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemCreateFromData.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 CommandHierarchyItemCreateFromData::CommandHierarchyItemCreateFromData(UndoStack* stack,
diff --git a/Gems/LyShine/Code/Editor/CommandHierarchyItemDelete.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemDelete.cpp
index 5ec18ca084..7d7ca6ee47 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemDelete.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemDelete.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include <Animation/UiEditorAnimationBus.h>
diff --git a/Gems/LyShine/Code/Editor/CommandHierarchyItemRename.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemRename.cpp
index 11552658b4..ab3e0cf9f7 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemRename.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemRename.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 CommandHierarchyItemRename::CommandHierarchyItemRename(UndoStack* stack,
diff --git a/Gems/LyShine/Code/Editor/CommandHierarchyItemReparent.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemReparent.cpp
index 8c1ddb7a52..9ccb094d0b 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemReparent.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemReparent.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include <AzCore/std/sort.h>
 
diff --git a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsExpanded.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsExpanded.cpp
index c1efdc9c5f..39808add73 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsExpanded.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsExpanded.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 CommandHierarchyItemToggleIsExpanded::CommandHierarchyItemToggleIsExpanded(UndoStack* stack,
diff --git a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelectable.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelectable.cpp
index 988b2b0ded..5a515d24ff 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelectable.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelectable.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 CommandHierarchyItemToggleIsSelectable::CommandHierarchyItemToggleIsSelectable(UndoStack* stack,
diff --git a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelected.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelected.cpp
index 36c722252e..98b270f3ae 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelected.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsSelected.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 CommandHierarchyItemToggleIsSelected::CommandHierarchyItemToggleIsSelected(UndoStack* stack,
diff --git a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsVisible.cpp b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsVisible.cpp
index b8f3407959..e45bcc33f7 100644
--- a/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsVisible.cpp
+++ b/Gems/LyShine/Code/Editor/CommandHierarchyItemToggleIsVisible.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 CommandHierarchyItemToggleIsVisible::CommandHierarchyItemToggleIsVisible(UndoStack* stack,
diff --git a/Gems/LyShine/Code/Editor/CommandPropertiesChange.cpp b/Gems/LyShine/Code/Editor/CommandPropertiesChange.cpp
index 0a0b2d105c..9c72739a04 100644
--- a/Gems/LyShine/Code/Editor/CommandPropertiesChange.cpp
+++ b/Gems/LyShine/Code/Editor/CommandPropertiesChange.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 CommandPropertiesChange::CommandPropertiesChange(UndoStack* stack,
diff --git a/Gems/LyShine/Code/Editor/CommandViewportInteractionMode.cpp b/Gems/LyShine/Code/Editor/CommandViewportInteractionMode.cpp
index 9d351a0405..305857fae3 100644
--- a/Gems/LyShine/Code/Editor/CommandViewportInteractionMode.cpp
+++ b/Gems/LyShine/Code/Editor/CommandViewportInteractionMode.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 CommandViewportInteractionMode::CommandViewportInteractionMode(UndoStack* stack,
diff --git a/Gems/LyShine/Code/Editor/ComponentButton.cpp b/Gems/LyShine/Code/Editor/ComponentButton.cpp
index ff03200477..4bebc8c71f 100644
--- a/Gems/LyShine/Code/Editor/ComponentButton.cpp
+++ b/Gems/LyShine/Code/Editor/ComponentButton.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 ComponentButton::ComponentButton(HierarchyWidget* hierarchy,
diff --git a/Gems/LyShine/Code/Editor/ComponentHelpers.cpp b/Gems/LyShine/Code/Editor/ComponentHelpers.cpp
index 12349dc908..194ab7bda8 100644
--- a/Gems/LyShine/Code/Editor/ComponentHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/ComponentHelpers.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "UiEditorInternalBus.h"
 #include <AzCore/Component/ComponentBus.h>
diff --git a/Gems/LyShine/Code/Editor/CoordinateSystemToolbarSection.cpp b/Gems/LyShine/Code/Editor/CoordinateSystemToolbarSection.cpp
index 3e3c027d02..7bca61b885 100644
--- a/Gems/LyShine/Code/Editor/CoordinateSystemToolbarSection.cpp
+++ b/Gems/LyShine/Code/Editor/CoordinateSystemToolbarSection.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include <LyShine/Bus/UiEditorCanvasBus.h>
 #include "CanvasHelpers.h"
diff --git a/Gems/LyShine/Code/Editor/EditorCommon.cpp b/Gems/LyShine/Code/Editor/EditorCommon.cpp
index d1b5736f77..6ba76ab274 100644
--- a/Gems/LyShine/Code/Editor/EditorCommon.cpp
+++ b/Gems/LyShine/Code/Editor/EditorCommon.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include <QApplication>
diff --git a/Gems/LyShine/Code/Editor/EditorMenu.cpp b/Gems/LyShine/Code/Editor/EditorMenu.cpp
index ec56c316ee..33b1e6b7d0 100644
--- a/Gems/LyShine/Code/Editor/EditorMenu.cpp
+++ b/Gems/LyShine/Code/Editor/EditorMenu.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "FeedbackDialog.h"
 #include <AzQtComponents/Buses/ShortcutDispatch.h>
@@ -17,6 +15,7 @@
 #include "CanvasHelpers.h"
 #include "GuideHelpers.h"
 #include <LyShine/Bus/UiEditorCanvasBus.h>
+#include <Util/PathUtil.h>
 
 #include <QFileDialog>
 #include <QMenuBar>
diff --git a/Gems/LyShine/Code/Editor/EditorWindow.cpp b/Gems/LyShine/Code/Editor/EditorWindow.cpp
index 7db6de5fc4..af07d3ceb4 100644
--- a/Gems/LyShine/Code/Editor/EditorWindow.cpp
+++ b/Gems/LyShine/Code/Editor/EditorWindow.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "CanvasHelpers.h"
 #include "AssetDropHelpers.h"
diff --git a/Gems/LyShine/Code/Editor/EnterPreviewToolbar.cpp b/Gems/LyShine/Code/Editor/EnterPreviewToolbar.cpp
index 90d93859bd..cd370fac71 100644
--- a/Gems/LyShine/Code/Editor/EnterPreviewToolbar.cpp
+++ b/Gems/LyShine/Code/Editor/EnterPreviewToolbar.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 EnterPreviewToolbar::EnterPreviewToolbar(EditorWindow* parent)
diff --git a/Gems/LyShine/Code/Editor/EntityHelpers.cpp b/Gems/LyShine/Code/Editor/EntityHelpers.cpp
index dc79b55213..57bf4460d2 100644
--- a/Gems/LyShine/Code/Editor/EntityHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/EntityHelpers.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "QtHelpers.h"
 
diff --git a/Gems/LyShine/Code/Editor/FeedbackDialog.cpp b/Gems/LyShine/Code/Editor/FeedbackDialog.cpp
index 17aa437a14..f3b03bd756 100644
--- a/Gems/LyShine/Code/Editor/FeedbackDialog.cpp
+++ b/Gems/LyShine/Code/Editor/FeedbackDialog.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "FeedbackDialog.h"
 
 #include <QBoxLayout>
diff --git a/Gems/LyShine/Code/Editor/FileHelpers.cpp b/Gems/LyShine/Code/Editor/FileHelpers.cpp
index 92298f1f0d..d393c3dfcc 100644
--- a/Gems/LyShine/Code/Editor/FileHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/FileHelpers.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include <AzCore/IO/Path/Path.h>
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 
diff --git a/Gems/LyShine/Code/Editor/FindEntityItemModel.cpp b/Gems/LyShine/Code/Editor/FindEntityItemModel.cpp
index 3b5332a448..8593dbe729 100644
--- a/Gems/LyShine/Code/Editor/FindEntityItemModel.cpp
+++ b/Gems/LyShine/Code/Editor/FindEntityItemModel.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "FindEntityItemModel.h"
 
 #include <AzFramework/StringFunc/StringFunc.h>
diff --git a/Gems/LyShine/Code/Editor/FindEntitySortFilterProxyModel.cpp b/Gems/LyShine/Code/Editor/FindEntitySortFilterProxyModel.cpp
index c0e7ba0489..1cd32ff619 100644
--- a/Gems/LyShine/Code/Editor/FindEntitySortFilterProxyModel.cpp
+++ b/Gems/LyShine/Code/Editor/FindEntitySortFilterProxyModel.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "FindEntitySortFilterProxyModel.h"
 #include "FindEntityItemModel.h"
 
diff --git a/Gems/LyShine/Code/Editor/FindEntityWidget.cpp b/Gems/LyShine/Code/Editor/FindEntityWidget.cpp
index 30b9424bd8..46de1fb465 100644
--- a/Gems/LyShine/Code/Editor/FindEntityWidget.cpp
+++ b/Gems/LyShine/Code/Editor/FindEntityWidget.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "FindEntityWidget.h"
 #include "FindEntityItemModel.h"
 #include "FindEntitySortFilterProxyModel.h"
diff --git a/Gems/LyShine/Code/Editor/FindEntityWidget.h b/Gems/LyShine/Code/Editor/FindEntityWidget.h
index 5913d688ea..5b12d8252e 100644
--- a/Gems/LyShine/Code/Editor/FindEntityWidget.h
+++ b/Gems/LyShine/Code/Editor/FindEntityWidget.h
@@ -12,6 +12,8 @@
 #include <AzCore/base.h>
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/Component/EntityId.h>
+#include <AzCore/std/containers/vector.h>
+#include <AzCore/std/containers/unordered_set.h>
 #include <AzQtComponents/Components/FilteredSearchWidget.h>
 
 #include <QWidget>
diff --git a/Gems/LyShine/Code/Editor/GuideHelpers.cpp b/Gems/LyShine/Code/Editor/GuideHelpers.cpp
index 9f24fb3c1a..ca0c04b4ad 100644
--- a/Gems/LyShine/Code/Editor/GuideHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/GuideHelpers.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "GuideHelpers.h"
 #include "CanvasHelpers.h"
diff --git a/Gems/LyShine/Code/Editor/HierarchyClipboard.cpp b/Gems/LyShine/Code/Editor/HierarchyClipboard.cpp
index 6a5dece2f4..a998c70461 100644
--- a/Gems/LyShine/Code/Editor/HierarchyClipboard.cpp
+++ b/Gems/LyShine/Code/Editor/HierarchyClipboard.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include <QMimeData>
diff --git a/Gems/LyShine/Code/Editor/HierarchyHeader.cpp b/Gems/LyShine/Code/Editor/HierarchyHeader.cpp
index 63eb04c50b..2d40cfba7e 100644
--- a/Gems/LyShine/Code/Editor/HierarchyHeader.cpp
+++ b/Gems/LyShine/Code/Editor/HierarchyHeader.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #define UICANVASEDITOR_HIERARCHY_HEADER_ICON_EYE        ":/Icons/Eye.svg"
diff --git a/Gems/LyShine/Code/Editor/HierarchyHelpers.cpp b/Gems/LyShine/Code/Editor/HierarchyHelpers.cpp
index 9a58a6f31b..bc1a8b1dae 100644
--- a/Gems/LyShine/Code/Editor/HierarchyHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/HierarchyHelpers.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include <QMessageBox>
diff --git a/Gems/LyShine/Code/Editor/HierarchyItem.cpp b/Gems/LyShine/Code/Editor/HierarchyItem.cpp
index 0a41758516..d7a07886d8 100644
--- a/Gems/LyShine/Code/Editor/HierarchyItem.cpp
+++ b/Gems/LyShine/Code/Editor/HierarchyItem.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include <AzCore/Asset/AssetManager.h>
 #include <AzToolsFramework/ToolsComponents/EditorOnlyEntityComponentBus.h>
diff --git a/Gems/LyShine/Code/Editor/HierarchyMenu.cpp b/Gems/LyShine/Code/Editor/HierarchyMenu.cpp
index 72868dccdb..ba44c3fccd 100644
--- a/Gems/LyShine/Code/Editor/HierarchyMenu.cpp
+++ b/Gems/LyShine/Code/Editor/HierarchyMenu.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include <AzToolsFramework/Slice/SliceUtilities.h>
 #include <AzToolsFramework/ToolsComponents/EditorOnlyEntityComponentBus.h>
diff --git a/Gems/LyShine/Code/Editor/HierarchyWidget.cpp b/Gems/LyShine/Code/Editor/HierarchyWidget.cpp
index e5d39282b2..65beb06c2b 100644
--- a/Gems/LyShine/Code/Editor/HierarchyWidget.cpp
+++ b/Gems/LyShine/Code/Editor/HierarchyWidget.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "AssetDropHelpers.h"
 #include "QtHelpers.h"
diff --git a/Gems/LyShine/Code/Editor/MainToolbar.cpp b/Gems/LyShine/Code/Editor/MainToolbar.cpp
index dbd2c70508..bb47d0dcf3 100644
--- a/Gems/LyShine/Code/Editor/MainToolbar.cpp
+++ b/Gems/LyShine/Code/Editor/MainToolbar.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include <QLabel>
diff --git a/Gems/LyShine/Code/Editor/ModeToolbar.cpp b/Gems/LyShine/Code/Editor/ModeToolbar.cpp
index 751f010efc..a5acfb8b8c 100644
--- a/Gems/LyShine/Code/Editor/ModeToolbar.cpp
+++ b/Gems/LyShine/Code/Editor/ModeToolbar.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "AlignToolbarSection.h"
 
diff --git a/Gems/LyShine/Code/Editor/NewElementToolbarSection.cpp b/Gems/LyShine/Code/Editor/NewElementToolbarSection.cpp
index d9342fe412..57e6385ae9 100644
--- a/Gems/LyShine/Code/Editor/NewElementToolbarSection.cpp
+++ b/Gems/LyShine/Code/Editor/NewElementToolbarSection.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 NewElementToolbarSection::NewElementToolbarSection(QToolBar* parent, bool addSeparator)
diff --git a/Gems/LyShine/Code/Editor/PivotPresets.cpp b/Gems/LyShine/Code/Editor/PivotPresets.cpp
index 5fae65d058..a042e5c605 100644
--- a/Gems/LyShine/Code/Editor/PivotPresets.cpp
+++ b/Gems/LyShine/Code/Editor/PivotPresets.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "PivotPresets.h"
 
 namespace
diff --git a/Gems/LyShine/Code/Editor/PivotPresetsWidget.cpp b/Gems/LyShine/Code/Editor/PivotPresetsWidget.cpp
index 1c17f53663..6516b948df 100644
--- a/Gems/LyShine/Code/Editor/PivotPresetsWidget.cpp
+++ b/Gems/LyShine/Code/Editor/PivotPresetsWidget.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "PresetButton.h"
 #include "PivotPresets.h"
 #include "PivotPresetsWidget.h"
diff --git a/Gems/LyShine/Code/Editor/PresetButton.cpp b/Gems/LyShine/Code/Editor/PresetButton.cpp
index 360e1acc15..ebb333e5fb 100644
--- a/Gems/LyShine/Code/Editor/PresetButton.cpp
+++ b/Gems/LyShine/Code/Editor/PresetButton.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "PresetButton.h"
 
 PresetButton::PresetButton(const QString& defaultIconPath,
diff --git a/Gems/LyShine/Code/Editor/PreviewActionLog.cpp b/Gems/LyShine/Code/Editor/PreviewActionLog.cpp
index afe4657dc8..b373a81af8 100644
--- a/Gems/LyShine/Code/Editor/PreviewActionLog.cpp
+++ b/Gems/LyShine/Code/Editor/PreviewActionLog.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include <QScrollBar>
diff --git a/Gems/LyShine/Code/Editor/PreviewAnimationList.cpp b/Gems/LyShine/Code/Editor/PreviewAnimationList.cpp
index 0bacf87a0d..f083a0c246 100644
--- a/Gems/LyShine/Code/Editor/PreviewAnimationList.cpp
+++ b/Gems/LyShine/Code/Editor/PreviewAnimationList.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include <LyShine/Animation/IUiAnimation.h>
 
diff --git a/Gems/LyShine/Code/Editor/PreviewToolbar.cpp b/Gems/LyShine/Code/Editor/PreviewToolbar.cpp
index 081582eda4..f72d94b89d 100644
--- a/Gems/LyShine/Code/Editor/PreviewToolbar.cpp
+++ b/Gems/LyShine/Code/Editor/PreviewToolbar.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include <QLabel>
diff --git a/Gems/LyShine/Code/Editor/PropertiesContainer.cpp b/Gems/LyShine/Code/Editor/PropertiesContainer.cpp
index e6b9d0513a..7a49dab943 100644
--- a/Gems/LyShine/Code/Editor/PropertiesContainer.cpp
+++ b/Gems/LyShine/Code/Editor/PropertiesContainer.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "CanvasHelpers.h"
 #include <AzQtComponents/Components/Style.h>
diff --git a/Gems/LyShine/Code/Editor/PropertiesWidget.cpp b/Gems/LyShine/Code/Editor/PropertiesWidget.cpp
index cacd1c118a..5c2a160211 100644
--- a/Gems/LyShine/Code/Editor/PropertiesWidget.cpp
+++ b/Gems/LyShine/Code/Editor/PropertiesWidget.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include <AzToolsFramework/ToolsComponents/ScriptEditorComponent.h>
 #include "CanvasHelpers.h"
diff --git a/Gems/LyShine/Code/Editor/PropertiesWrapper.cpp b/Gems/LyShine/Code/Editor/PropertiesWrapper.cpp
index 8ddf8145f3..bfd8b6d3e0 100644
--- a/Gems/LyShine/Code/Editor/PropertiesWrapper.cpp
+++ b/Gems/LyShine/Code/Editor/PropertiesWrapper.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "AssetDropHelpers.h"
 
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerAnchor.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerAnchor.cpp
index 927b474838..49b18c79de 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerAnchor.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerAnchor.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "EditorCommon.h"
 
 #include "PropertyHandlerAnchor.h"
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerChar.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerChar.cpp
index b016d1cebe..10453024b0 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerChar.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerChar.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include "PropertyHandlerChar.h"
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.cpp
index 34839cde5f..99e4ea3f2f 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerDirectory.cpp
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "EditorCommon.h"
 
 #include "PropertyHandlerDirectory.h"
 
 #include <AzToolsFramework/UI/PropertyEditor/PropertyQTConstants.h>
 #include <LyShine/Bus/UiEditorChangeNotificationBus.h>
+#include <Editor/Util/PathUtil.h>
 
 #include <QBoxLayout>
 
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerEntityIdComboBox.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerEntityIdComboBox.cpp
index d0b3e0bdc2..34b0f8544f 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerEntityIdComboBox.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerEntityIdComboBox.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include "PropertyHandlerEntityIdComboBox.h"
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerLayoutPadding.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerLayoutPadding.cpp
index a068fc9e4a..3b80a653c0 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerLayoutPadding.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerLayoutPadding.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "EditorCommon.h"
 
 #include "PropertyHandlerLayoutPadding.h"
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerOffset.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerOffset.cpp
index ebb4620034..5d30908d89 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerOffset.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerOffset.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "EditorCommon.h"
 
 #include "PropertyHandlerOffset.h"
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerPivot.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerPivot.cpp
index 6be0e9ef74..b770d304f5 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerPivot.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerPivot.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "EditorCommon.h"
 
 #include "PropertyHandlerPivot.h"
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerSprite.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerSprite.cpp
index 93bede104f..8a1a4365cd 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerSprite.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerSprite.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "EditorCommon.h"
 #include "Sprite.h"
 
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.cpp
index 48088bca39..486b1a2d6a 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleColorKeyframe.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "EditorCommon.h"
 
 #include "PropertyHandlerUiParticleColorKeyframe.h"
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.cpp
index 8b968f3087..6e2bd931a2 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerUiParticleFloatKeyframe.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "EditorCommon.h"
 
 #include "PropertyHandlerUiParticleFloatKeyframe.h"
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlerVec.cpp b/Gems/LyShine/Code/Editor/PropertyHandlerVec.cpp
index fe2cbdf49c..c30e0b10f1 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlerVec.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlerVec.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "EditorCommon.h"
 
 #include "PropertyHandlerVec.h"
diff --git a/Gems/LyShine/Code/Editor/PropertyHandlers.cpp b/Gems/LyShine/Code/Editor/PropertyHandlers.cpp
index 8a61bf19c0..eb9b9fb9a8 100644
--- a/Gems/LyShine/Code/Editor/PropertyHandlers.cpp
+++ b/Gems/LyShine/Code/Editor/PropertyHandlers.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "EditorCommon.h"
 
 #include "PropertyHandlerAnchor.h"
diff --git a/Gems/LyShine/Code/Editor/QtHelpers.cpp b/Gems/LyShine/Code/Editor/QtHelpers.cpp
index 9897012358..3877c33cfe 100644
--- a/Gems/LyShine/Code/Editor/QtHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/QtHelpers.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include <QtGui/private/qhighdpiscaling_p.h>
diff --git a/Gems/LyShine/Code/Editor/RecentFiles.cpp b/Gems/LyShine/Code/Editor/RecentFiles.cpp
index 637a880bb9..eade47e025 100644
--- a/Gems/LyShine/Code/Editor/RecentFiles.cpp
+++ b/Gems/LyShine/Code/Editor/RecentFiles.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include <QSettings>
diff --git a/Gems/LyShine/Code/Editor/RulerWidget.cpp b/Gems/LyShine/Code/Editor/RulerWidget.cpp
index 6baea22d3b..f70e749445 100644
--- a/Gems/LyShine/Code/Editor/RulerWidget.cpp
+++ b/Gems/LyShine/Code/Editor/RulerWidget.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "RulerWidget.h"
 #include "CanvasHelpers.h"
 #include "GuideHelpers.h"
diff --git a/Gems/LyShine/Code/Editor/SelectionHelpers.cpp b/Gems/LyShine/Code/Editor/SelectionHelpers.cpp
index 7d911dd475..31f39253a2 100644
--- a/Gems/LyShine/Code/Editor/SelectionHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/SelectionHelpers.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 namespace SelectionHelpers
diff --git a/Gems/LyShine/Code/Editor/SerializeHelpers.cpp b/Gems/LyShine/Code/Editor/SerializeHelpers.cpp
index c834929472..85eca2b13e 100644
--- a/Gems/LyShine/Code/Editor/SerializeHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/SerializeHelpers.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include <AzCore/Serialization/Utils.h>
diff --git a/Gems/LyShine/Code/Editor/SliceMenuHelpers.cpp b/Gems/LyShine/Code/Editor/SliceMenuHelpers.cpp
index 69ce21a275..db335175ba 100644
--- a/Gems/LyShine/Code/Editor/SliceMenuHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/SliceMenuHelpers.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "AssetTreeEntry.h"
 
diff --git a/Gems/LyShine/Code/Editor/SlicerEdit.cpp b/Gems/LyShine/Code/Editor/SlicerEdit.cpp
index fc6116833c..43684b2b1a 100644
--- a/Gems/LyShine/Code/Editor/SlicerEdit.cpp
+++ b/Gems/LyShine/Code/Editor/SlicerEdit.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "SpriteBorderEditorCommon.h"
 
 SlicerEdit::SlicerEdit(
diff --git a/Gems/LyShine/Code/Editor/SlicerManipulator.cpp b/Gems/LyShine/Code/Editor/SlicerManipulator.cpp
index cddc4b1a98..41fbb61cf8 100644
--- a/Gems/LyShine/Code/Editor/SlicerManipulator.cpp
+++ b/Gems/LyShine/Code/Editor/SlicerManipulator.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "SpriteBorderEditorCommon.h"
 
 #define UICANVASEDITOR_DRAW_SELECTABLE_AREA_OF_SLICERMANIPULATOR    (0)
diff --git a/Gems/LyShine/Code/Editor/SlicerView.cpp b/Gems/LyShine/Code/Editor/SlicerView.cpp
index f303852874..597b4a7e01 100644
--- a/Gems/LyShine/Code/Editor/SlicerView.cpp
+++ b/Gems/LyShine/Code/Editor/SlicerView.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "SpriteBorderEditorCommon.h"
 
 SlicerView::SlicerView(QGraphicsScene* scene, QWidget* parent)
diff --git a/Gems/LyShine/Code/Editor/SpriteBorderEditor.cpp b/Gems/LyShine/Code/Editor/SpriteBorderEditor.cpp
index a37f401581..60c002446c 100644
--- a/Gems/LyShine/Code/Editor/SpriteBorderEditor.cpp
+++ b/Gems/LyShine/Code/Editor/SpriteBorderEditor.cpp
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "SpriteBorderEditorCommon.h"
 
 #include <QMessageBox>
 #include <QApplication>
+#include <Util/PathUtil.h>
 //-------------------------------------------------------------------------------
 
 namespace
diff --git a/Gems/LyShine/Code/Editor/SpriteBorderEditorCommon.cpp b/Gems/LyShine/Code/Editor/SpriteBorderEditorCommon.cpp
index 9aaf017c9a..e1ad416384 100644
--- a/Gems/LyShine/Code/Editor/SpriteBorderEditorCommon.cpp
+++ b/Gems/LyShine/Code/Editor/SpriteBorderEditorCommon.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
 #include "SpriteBorderEditorCommon.h"
 
 bool IsBorderVertical(SpriteBorder border)
diff --git a/Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h b/Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
deleted file mode 100644
index 943e825905..0000000000
--- a/Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
+++ /dev/null
@@ -1,43 +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>
-
-/////////////////////////////////////////////////////////////////////////////
-// CRY Stuff ////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-#include <platform.h>
-
-/////////////////////////////////////////////////////////////////////////////
-// STL
-/////////////////////////////////////////////////////////////////////////////
-#include <vector>
-#include <list>
-#include <map>
-#include <set>
-#include <algorithm>
-
-/////////////////////////////////////////////////////////////////////////////
-// CRY Stuff ////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-#include <ISystem.h>
-#include <Util/EditorUtils.h>
-#include <Util/PathUtil.h>
-
-
-#include <Cry_Math.h>
-
-#ifdef min
-#undef min
-#endif
-#ifdef max
-#undef max
-#endif
-#ifdef LoadCursor
-#undef LoadCursor
-#endif
diff --git a/Gems/LyShine/Code/Editor/UiEditorEntityContext.cpp b/Gems/LyShine/Code/Editor/UiEditorEntityContext.cpp
index f5715f0d87..7328f1214c 100644
--- a/Gems/LyShine/Code/Editor/UiEditorEntityContext.cpp
+++ b/Gems/LyShine/Code/Editor/UiEditorEntityContext.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Component/EntityUtils.h>
diff --git a/Gems/LyShine/Code/Editor/UiSliceManager.cpp b/Gems/LyShine/Code/Editor/UiSliceManager.cpp
index baacc0b5f4..d310c2fc49 100644
--- a/Gems/LyShine/Code/Editor/UiSliceManager.cpp
+++ b/Gems/LyShine/Code/Editor/UiSliceManager.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include <AzToolsFramework/Slice/SliceUtilities.h>
 
diff --git a/Gems/LyShine/Code/Editor/UndoStack.cpp b/Gems/LyShine/Code/Editor/UndoStack.cpp
index 94279944b7..dc9de2801d 100644
--- a/Gems/LyShine/Code/Editor/UndoStack.cpp
+++ b/Gems/LyShine/Code/Editor/UndoStack.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include <QUndoGroup>
diff --git a/Gems/LyShine/Code/Editor/UndoStackExecutionScope.cpp b/Gems/LyShine/Code/Editor/UndoStackExecutionScope.cpp
index ed45890d5c..07cf1f5ab7 100644
--- a/Gems/LyShine/Code/Editor/UndoStackExecutionScope.cpp
+++ b/Gems/LyShine/Code/Editor/UndoStackExecutionScope.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 UndoStackExecutionScope::UndoStackExecutionScope(UndoStack* stack)
diff --git a/Gems/LyShine/Code/Editor/ViewportAddGuideInteraction.cpp b/Gems/LyShine/Code/Editor/ViewportAddGuideInteraction.cpp
index 052c8b9bea..1ae6af0538 100644
--- a/Gems/LyShine/Code/Editor/ViewportAddGuideInteraction.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportAddGuideInteraction.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include "ViewportAddGuideInteraction.h"
diff --git a/Gems/LyShine/Code/Editor/ViewportAlign.cpp b/Gems/LyShine/Code/Editor/ViewportAlign.cpp
index dc74afce86..c6a6bbe051 100644
--- a/Gems/LyShine/Code/Editor/ViewportAlign.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportAlign.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "ViewportAlign.h"
 #include <LyShine/UiComponentTypes.h>
diff --git a/Gems/LyShine/Code/Editor/ViewportAnchor.cpp b/Gems/LyShine/Code/Editor/ViewportAnchor.cpp
index ed5a584ab3..e0acf5f3f9 100644
--- a/Gems/LyShine/Code/Editor/ViewportAnchor.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportAnchor.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 ViewportAnchor::ViewportAnchor()
diff --git a/Gems/LyShine/Code/Editor/ViewportCanvasBackground.cpp b/Gems/LyShine/Code/Editor/ViewportCanvasBackground.cpp
index 00d4aa38ad..8a20a4c868 100644
--- a/Gems/LyShine/Code/Editor/ViewportCanvasBackground.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportCanvasBackground.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include <LyShine/UiSerializeHelpers.h>
 #include "EditorCommon.h"
 
diff --git a/Gems/LyShine/Code/Editor/ViewportDragInteraction.cpp b/Gems/LyShine/Code/Editor/ViewportDragInteraction.cpp
index c8c3f42f05..f88a246a38 100644
--- a/Gems/LyShine/Code/Editor/ViewportDragInteraction.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportDragInteraction.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "ViewportDragInteraction.h"
 
 ViewportDragInteraction::ViewportDragInteraction(const AZ::Vector2& startMousePos)
diff --git a/Gems/LyShine/Code/Editor/ViewportElement.cpp b/Gems/LyShine/Code/Editor/ViewportElement.cpp
index 7eb1a54309..7dd7775528 100644
--- a/Gems/LyShine/Code/Editor/ViewportElement.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportElement.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "ViewportSnap.h"
 #include "ViewportElement.h"
diff --git a/Gems/LyShine/Code/Editor/ViewportHelpers.cpp b/Gems/LyShine/Code/Editor/ViewportHelpers.cpp
index a5a470ecee..8fc1ae9e2a 100644
--- a/Gems/LyShine/Code/Editor/ViewportHelpers.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportHelpers.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "ViewportPivot.h"
 
diff --git a/Gems/LyShine/Code/Editor/ViewportHighlight.cpp b/Gems/LyShine/Code/Editor/ViewportHighlight.cpp
index 274105e1d7..38d1c6e338 100644
--- a/Gems/LyShine/Code/Editor/ViewportHighlight.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportHighlight.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 ViewportHighlight::ViewportHighlight()
diff --git a/Gems/LyShine/Code/Editor/ViewportIcon.cpp b/Gems/LyShine/Code/Editor/ViewportIcon.cpp
index 71fa8673ec..87e391ef6f 100644
--- a/Gems/LyShine/Code/Editor/ViewportIcon.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportIcon.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include <LyShine/Draw2d.h>
 
diff --git a/Gems/LyShine/Code/Editor/ViewportInteraction.cpp b/Gems/LyShine/Code/Editor/ViewportInteraction.cpp
index 58e324eef3..dbbc025007 100644
--- a/Gems/LyShine/Code/Editor/ViewportInteraction.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportInteraction.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "ViewportNudge.h"
 #include "ViewportElement.h"
@@ -26,6 +24,7 @@
 #include <QSettings>
 
 #include <Editor/Resource.h>
+#include <Editor/Util/EditorUtils.h>
 
 static const float g_elementEdgeForgiveness = 10.0f;
 
diff --git a/Gems/LyShine/Code/Editor/ViewportMoveGuideInteraction.cpp b/Gems/LyShine/Code/Editor/ViewportMoveGuideInteraction.cpp
index bb99c33e8b..121886fe53 100644
--- a/Gems/LyShine/Code/Editor/ViewportMoveGuideInteraction.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportMoveGuideInteraction.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include "ViewportMoveGuideInteraction.h"
diff --git a/Gems/LyShine/Code/Editor/ViewportMoveInteraction.cpp b/Gems/LyShine/Code/Editor/ViewportMoveInteraction.cpp
index bcfa4c9fc8..87c0512fd2 100644
--- a/Gems/LyShine/Code/Editor/ViewportMoveInteraction.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportMoveInteraction.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include "ViewportMoveInteraction.h"
diff --git a/Gems/LyShine/Code/Editor/ViewportNudge.cpp b/Gems/LyShine/Code/Editor/ViewportNudge.cpp
index 6ae0d9b50e..3d7fdab34a 100644
--- a/Gems/LyShine/Code/Editor/ViewportNudge.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportNudge.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "ViewportNudge.h"
 
diff --git a/Gems/LyShine/Code/Editor/ViewportPivot.cpp b/Gems/LyShine/Code/Editor/ViewportPivot.cpp
index 92c22d3db4..c875dbce35 100644
--- a/Gems/LyShine/Code/Editor/ViewportPivot.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportPivot.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "ViewportPivot.h"
 
diff --git a/Gems/LyShine/Code/Editor/ViewportSnap.cpp b/Gems/LyShine/Code/Editor/ViewportSnap.cpp
index d6040cdb36..f88bd49eae 100644
--- a/Gems/LyShine/Code/Editor/ViewportSnap.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportSnap.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 #include "ViewportSnap.h"
 #include <LyShine/Bus/UiEditorCanvasBus.h>
diff --git a/Gems/LyShine/Code/Editor/ViewportWidget.cpp b/Gems/LyShine/Code/Editor/ViewportWidget.cpp
index af0f93d8fa..6901df2bea 100644
--- a/Gems/LyShine/Code/Editor/ViewportWidget.cpp
+++ b/Gems/LyShine/Code/Editor/ViewportWidget.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "UiCanvasEditor_precompiled.h"
-
 #include "EditorCommon.h"
 
 #include "EditorDefs.h"
diff --git a/Gems/LyShine/Code/lyshine_uicanvaseditor_files.cmake b/Gems/LyShine/Code/lyshine_uicanvaseditor_files.cmake
index 7d6e995d10..ad2338bd03 100644
--- a/Gems/LyShine/Code/lyshine_uicanvaseditor_files.cmake
+++ b/Gems/LyShine/Code/lyshine_uicanvaseditor_files.cmake
@@ -8,7 +8,6 @@
 set(FILES
     Editor/LyShineEditorSystemComponent.cpp
     Editor/LyShineEditorSystemComponent.h
-    Editor/UiCanvasEditor_precompiled.h
     Editor/UiCanvasEditor.qrc
     Editor/Animation/UiAnimViewDialog.cpp
     Editor/Animation/UiAnimViewDialog.h