diff --git a/Code/Editor/Plugins/ProjectSettingsTool/DefaultImageValidator.cpp b/Code/Editor/Plugins/ProjectSettingsTool/DefaultImageValidator.cpp
index 68df8aa5e6..815ca19ee3 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/DefaultImageValidator.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/DefaultImageValidator.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
 #include "DefaultImageValidator.h"
 
 #include "PropertyImagePreview.h"
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/FunctorValidator.cpp b/Code/Editor/Plugins/ProjectSettingsTool/FunctorValidator.cpp
index bd01589700..85ebedb221 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/FunctorValidator.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/FunctorValidator.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
 #include "FunctorValidator.h"
 
 namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/LastPathBus.h b/Code/Editor/Plugins/ProjectSettingsTool/LastPathBus.h
index 2e3f370a92..b3d03cab29 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/LastPathBus.h
+++ b/Code/Editor/Plugins/ProjectSettingsTool/LastPathBus.h
@@ -9,6 +9,7 @@
 
 #include <AzCore/EBus/EBus.h>
 
+#include <QtCore/QString>
 
 namespace ProjectSettingsTool
 {
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Android.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Android.cpp
index 146c2fc3d6..7afc1c6436 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Android.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Android.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
 #include "PlatformSettings_Android.h"
 
 #include "PlatformSettings_common.h"
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Base.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Base.cpp
index 724e47c87b..c1654459a6 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Base.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Base.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
 #include "PlatformSettings_Base.h"
 
 #include "PlatformSettings_common.h"
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Ios.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Ios.cpp
index d29376cfa7..c4ecad0e9f 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Ios.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Ios.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
 #include "PlatformSettings_Ios.h"
 
 #include "PlatformSettings_common.h"
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PlistDictionary.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PlistDictionary.cpp
index fe8c643b89..f31c105491 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/PlistDictionary.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PlistDictionary.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
 #include "PlistDictionary.h"
 
 
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsContainer.cpp b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsContainer.cpp
index 15193b1aa4..adafb8f17e 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsContainer.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsContainer.cpp
@@ -5,13 +5,13 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
 #include "ProjectSettingsContainer.h"
 
 #include <AzCore/JSON/prettywriter.h>
 #include <AzCore/JSON/stringbuffer.h>
 #include <AzCore/XML/rapidxml_print.h>
 
+#include <CryCommon/platform.h>
 #include <Util/FileUtil.h>
 
 namespace ProjectSettingsTool
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsContainer.h b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsContainer.h
index b994ab1d72..4b557bdfc0 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsContainer.h
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsContainer.h
@@ -14,6 +14,8 @@
 #include <AzCore/Outcome/Outcome.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzCore/std/string/string.h>
+#include <AzCore/std/containers/queue.h>
+#include <AzCore/std/containers/unordered_map.h>
 
 #include <AzFramework/StringFunc/StringFunc.h>
 
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.cpp b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.cpp
index 107d0829ba..86ffea7ea3 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsSerialization.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
+#include <EditorDefs.h>
 #include "ProjectSettingsSerialization.h"
 
 #include "PlatformSettings_common.h"
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp
index f4e4fed973..048bbaeb77 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
+#include <EditorDefs.h>
 #include "ProjectSettingsToolWindow.h"
 #include "ui_ProjectSettingsToolWidget.h"
 
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
deleted file mode 100644
index 49b28d9834..0000000000
--- a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
+++ /dev/null
@@ -1,16 +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>
-
-/////////////////////////////////////////////////////////////////////////////
-// Engine
-/////////////////////////////////////////////////////////////////////////////
-#include <ISystem.h>
-#include <Cry_Math.h>
-
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsValidator.cpp b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsValidator.cpp
index a38ae10faf..84dd86b6b3 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsValidator.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsValidator.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
 #include "ProjectSettingsValidator.h"
 
 #include "Validators.h"
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PropertyFileSelect.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFileSelect.cpp
index 725ae718b6..a514a8323d 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/PropertyFileSelect.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFileSelect.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
 #include "PropertyFileSelect.h"
 
 #include "PlatformSettings_common.h"
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.cpp
index 635d7058f2..b69d47cd76 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValBrowseEdit.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
 #include "PropertyFuncValBrowseEdit.h"
 #include "PlatformSettings_common.h"
 #include "ValidationHandler.h"
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.cpp
index dd0d8f69fb..3126d01041 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PropertyFuncValLineEdit.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
 #include "PropertyFuncValLineEdit.h"
 
 #include "PlatformSettings_common.h"
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PropertyImagePreview.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PropertyImagePreview.cpp
index a47c8c3dc4..963341247c 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/PropertyImagePreview.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PropertyImagePreview.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
 #include "PropertyImagePreview.h"
 
 #include "DefaultImageValidator.h"
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/PropertyLinked.cpp b/Code/Editor/Plugins/ProjectSettingsTool/PropertyLinked.cpp
index ea13b00a8e..b3b8259501 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/PropertyLinked.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/PropertyLinked.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
 #include "PropertyLinked.h"
 
 #include "PlatformSettings_common.h"
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/Utils.cpp b/Code/Editor/Plugins/ProjectSettingsTool/Utils.cpp
index b8b92e5197..df35372944 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/Utils.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/Utils.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
 #include "Utils.h"
 #include "LastPathBus.h"
 
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ValidationHandler.cpp b/Code/Editor/Plugins/ProjectSettingsTool/ValidationHandler.cpp
index c873b58a0b..200816789b 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/ValidationHandler.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/ValidationHandler.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
-
 #include "ValidationHandler.h"
 
 #include "PropertyFuncValLineEdit.h"
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/Validators.cpp b/Code/Editor/Plugins/ProjectSettingsTool/Validators.cpp
index c17da8e40b..b8bf7e27df 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/Validators.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/Validators.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "ProjectSettingsTool_precompiled.h"
 #include "Validators.h"
 
 #include <QDir>
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/main.cpp b/Code/Editor/Plugins/ProjectSettingsTool/main.cpp
index a348f81f2b..31e0b2752d 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/main.cpp
+++ b/Code/Editor/Plugins/ProjectSettingsTool/main.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "ProjectSettingsTool_precompiled.h"
 
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <AzToolsFramework/API/ViewPaneOptions.h>
diff --git a/Code/Editor/Plugins/ProjectSettingsTool/projectsettingstool_files.cmake b/Code/Editor/Plugins/ProjectSettingsTool/projectsettingstool_files.cmake
index 5d418e9926..a192d4246f 100644
--- a/Code/Editor/Plugins/ProjectSettingsTool/projectsettingstool_files.cmake
+++ b/Code/Editor/Plugins/ProjectSettingsTool/projectsettingstool_files.cmake
@@ -7,7 +7,6 @@
 
 set(FILES
     main.cpp
-    ProjectSettingsTool_precompiled.h
     DefaultImageValidator.cpp
     DefaultImageValidator.h
     FunctorValidator.cpp