diff --git a/Gems/PhysX/Code/CMakeLists.txt b/Gems/PhysX/Code/CMakeLists.txt
index d3cc95d0a1..40187d8f00 100644
--- a/Gems/PhysX/Code/CMakeLists.txt
+++ b/Gems/PhysX/Code/CMakeLists.txt
@@ -30,6 +30,7 @@ ly_add_target(
     COMPILE_DEFINITIONS
         PUBLIC
             PHYSX_ENABLE_MULTI_THREADING
+            $<$<NOT:$<CONFIG:release>>:AZ_PHYSICS_DEBUG_ENABLED>
     INCLUDE_DIRECTORIES
         PUBLIC
             .
diff --git a/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp b/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp
index ed3d8b793f..0c58b32446 100644
--- a/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderAssetScaleMode.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include "ColliderAssetScaleMode.h"
 #include <PhysX/EditorColliderComponentRequestBus.h>
 #include <AzToolsFramework/Manipulators/ManipulatorManager.h>
diff --git a/Gems/PhysX/Code/Editor/ColliderBoxMode.cpp b/Gems/PhysX/Code/Editor/ColliderBoxMode.cpp
index 3c8cfa5ee2..1d7bcd46b0 100644
--- a/Gems/PhysX/Code/Editor/ColliderBoxMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderBoxMode.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include "ColliderBoxMode.h"
 #include <AzToolsFramework/Manipulators/BoxManipulatorRequestBus.h>
 
diff --git a/Gems/PhysX/Code/Editor/ColliderCapsuleMode.cpp b/Gems/PhysX/Code/Editor/ColliderCapsuleMode.cpp
index d1240900b0..ad14153ba8 100644
--- a/Gems/PhysX/Code/Editor/ColliderCapsuleMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderCapsuleMode.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include "ColliderCapsuleMode.h"
 #include <PhysX/EditorColliderComponentRequestBus.h>
 
diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp
index c084cfa6e0..12fc156011 100644
--- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include "ColliderComponentMode.h"
 #include "ColliderSubComponentMode.h"
 #include "ColliderOffsetMode.h"
diff --git a/Gems/PhysX/Code/Editor/ColliderOffsetMode.cpp b/Gems/PhysX/Code/Editor/ColliderOffsetMode.cpp
index cf194028ea..ea7a0dccbb 100644
--- a/Gems/PhysX/Code/Editor/ColliderOffsetMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderOffsetMode.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include "ColliderOffsetMode.h"
 #include <PhysX/EditorColliderComponentRequestBus.h>
 
diff --git a/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp b/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp
index 6d86c0ad6c..cc93fb9d82 100644
--- a/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderRotationMode.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include "ColliderRotationMode.h"
 #include <PhysX/EditorColliderComponentRequestBus.h>
 #include <AzToolsFramework/Manipulators/ManipulatorManager.h>
diff --git a/Gems/PhysX/Code/Editor/ColliderSphereMode.cpp b/Gems/PhysX/Code/Editor/ColliderSphereMode.cpp
index cc8427c973..6f16247e85 100644
--- a/Gems/PhysX/Code/Editor/ColliderSphereMode.cpp
+++ b/Gems/PhysX/Code/Editor/ColliderSphereMode.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include "ColliderSphereMode.h"
 #include <PhysX/EditorColliderComponentRequestBus.h>
 
diff --git a/Gems/PhysX/Code/Editor/CollisionFilteringWidget.cpp b/Gems/PhysX/Code/Editor/CollisionFilteringWidget.cpp
index c449e9d903..44afc4dce7 100644
--- a/Gems/PhysX/Code/Editor/CollisionFilteringWidget.cpp
+++ b/Gems/PhysX/Code/Editor/CollisionFilteringWidget.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <Editor/CollisionFilteringWidget.h>
 #include <Editor/CollisionLayersWidget.h>
 #include <Editor/CollisionGroupsWidget.h>
diff --git a/Gems/PhysX/Code/Editor/CollisionGroupWidget.cpp b/Gems/PhysX/Code/Editor/CollisionGroupWidget.cpp
index 9278e8ecee..12ce4b4ecd 100644
--- a/Gems/PhysX/Code/Editor/CollisionGroupWidget.cpp
+++ b/Gems/PhysX/Code/Editor/CollisionGroupWidget.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <Editor/CollisionGroupWidget.h>
 #include <Editor/ConfigurationWindowBus.h>
 #include <AzCore/Interface/Interface.h>
diff --git a/Gems/PhysX/Code/Editor/CollisionGroupsWidget.cpp b/Gems/PhysX/Code/Editor/CollisionGroupsWidget.cpp
index ab5280c97a..8d84972ddd 100644
--- a/Gems/PhysX/Code/Editor/CollisionGroupsWidget.cpp
+++ b/Gems/PhysX/Code/Editor/CollisionGroupsWidget.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzFramework/Physics/SystemBus.h>
 #include <QBoxLayout>
 #include <QCheckBox>
diff --git a/Gems/PhysX/Code/Editor/CollisionLayerWidget.cpp b/Gems/PhysX/Code/Editor/CollisionLayerWidget.cpp
index cb90ddcce6..6503c4b2b7 100644
--- a/Gems/PhysX/Code/Editor/CollisionLayerWidget.cpp
+++ b/Gems/PhysX/Code/Editor/CollisionLayerWidget.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <Editor/CollisionLayerWidget.h>
 #include <Editor/ConfigurationWindowBus.h>
 #include <AzFramework/Physics/CollisionBus.h>
diff --git a/Gems/PhysX/Code/Editor/CollisionLayersWidget.cpp b/Gems/PhysX/Code/Editor/CollisionLayersWidget.cpp
index c7b6234e1f..986ed741a6 100644
--- a/Gems/PhysX/Code/Editor/CollisionLayersWidget.cpp
+++ b/Gems/PhysX/Code/Editor/CollisionLayersWidget.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzFramework/Physics/Utils.h>
 #include <AzToolsFramework/UI/PropertyEditor/PropertyStringLineEditCtrl.hxx>
diff --git a/Gems/PhysX/Code/Editor/ComboBoxEditButtonPair.cpp b/Gems/PhysX/Code/Editor/ComboBoxEditButtonPair.cpp
index 278ebbf4d2..e0937687fa 100644
--- a/Gems/PhysX/Code/Editor/ComboBoxEditButtonPair.cpp
+++ b/Gems/PhysX/Code/Editor/ComboBoxEditButtonPair.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <Editor/ComboBoxEditButtonPair.h>
 
 namespace PhysX
diff --git a/Gems/PhysX/Code/Editor/ConfigStringLineEditCtrl.cpp b/Gems/PhysX/Code/Editor/ConfigStringLineEditCtrl.cpp
index d99089b697..97d51a2079 100644
--- a/Gems/PhysX/Code/Editor/ConfigStringLineEditCtrl.cpp
+++ b/Gems/PhysX/Code/Editor/ConfigStringLineEditCtrl.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "PhysX_precompiled.h"
-
 #include <AzFramework/Physics/Material.h>
 #include <AzToolsFramework/UI/PropertyEditor/PropertyQTConstants.h>
 #include <AzQtComponents/Components/StyledLineEdit.h>
diff --git a/Gems/PhysX/Code/Editor/ConfigurationWidget.cpp b/Gems/PhysX/Code/Editor/ConfigurationWidget.cpp
index edf475020e..a1dffb6530 100644
--- a/Gems/PhysX/Code/Editor/ConfigurationWidget.cpp
+++ b/Gems/PhysX/Code/Editor/ConfigurationWidget.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
 #include <AzFramework/Physics/SystemBus.h>
 #include <AzFramework/Physics/Collision/CollisionGroups.h>
 #include <AzFramework/Physics/Collision/CollisionLayers.h>
diff --git a/Gems/PhysX/Code/Editor/DebugDraw.cpp b/Gems/PhysX/Code/Editor/DebugDraw.cpp
index 8e187a0ab3..5e3c7d3834 100644
--- a/Gems/PhysX/Code/Editor/DebugDraw.cpp
+++ b/Gems/PhysX/Code/Editor/DebugDraw.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <Editor/DebugDraw.h>
 #include <Editor/ConfigurationWindowBus.h>
 #include <AzCore/Component/TransformBus.h>
@@ -20,6 +19,7 @@
 #include <Source/Utils.h>
 
 #include <PhysX/Debug/PhysXDebugInterface.h>
+#include <PhysX/MathConversion.h>
 
 namespace PhysX
 {
diff --git a/Gems/PhysX/Code/Editor/DebugDraw.h b/Gems/PhysX/Code/Editor/DebugDraw.h
index 219cd2deff..d2df25d641 100644
--- a/Gems/PhysX/Code/Editor/DebugDraw.h
+++ b/Gems/PhysX/Code/Editor/DebugDraw.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>
 #include <AzFramework/Physics/ShapeConfiguration.h>
@@ -16,6 +17,11 @@
 #include <PhysX/Debug/PhysXDebugConfiguration.h>
 #include <PhysX/Debug/PhysXDebugInterface.h>
 
+namespace physx
+{
+    class PxBase;
+}
+
 namespace PhysX
 {
     namespace DebugDraw
diff --git a/Gems/PhysX/Code/Editor/DocumentationLinkWidget.cpp b/Gems/PhysX/Code/Editor/DocumentationLinkWidget.cpp
index 7bafb08675..2372b0c0b4 100644
--- a/Gems/PhysX/Code/Editor/DocumentationLinkWidget.cpp
+++ b/Gems/PhysX/Code/Editor/DocumentationLinkWidget.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <Editor/DocumentationLinkWidget.h>
 
 namespace PhysX
diff --git a/Gems/PhysX/Code/Editor/EditorClassConverters.cpp b/Gems/PhysX/Code/Editor/EditorClassConverters.cpp
index 237bf3104b..a65bb61c5b 100644
--- a/Gems/PhysX/Code/Editor/EditorClassConverters.cpp
+++ b/Gems/PhysX/Code/Editor/EditorClassConverters.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
 #include <Editor/EditorClassConverters.h>
 #include <Source/EditorColliderComponent.h>
 #include <PhysX/MeshAsset.h>
diff --git a/Gems/PhysX/Code/Editor/EditorJointComponentMode.cpp b/Gems/PhysX/Code/Editor/EditorJointComponentMode.cpp
index 4da6e8b892..fc92eb2b8b 100644
--- a/Gems/PhysX/Code/Editor/EditorJointComponentMode.cpp
+++ b/Gems/PhysX/Code/Editor/EditorJointComponentMode.cpp
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <Editor/EditorJointConfiguration.h>
 #include <Editor/EditorJointComponentMode.h>
 #include <Editor/EditorSubComponentModeAngleCone.h>
diff --git a/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp b/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp
index a5bc482c0a..93d0e9fa74 100644
--- a/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp
+++ b/Gems/PhysX/Code/Editor/EditorJointConfiguration.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <Editor/EditorJointConfiguration.h>
diff --git a/Gems/PhysX/Code/Editor/EditorJointTypeDrawer.cpp b/Gems/PhysX/Code/Editor/EditorJointTypeDrawer.cpp
index 403dc6465c..f47d3f4131 100644
--- a/Gems/PhysX/Code/Editor/EditorJointTypeDrawer.cpp
+++ b/Gems/PhysX/Code/Editor/EditorJointTypeDrawer.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
 #include <Editor/EditorJointTypeDrawer.h>
 
diff --git a/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.cpp
index 69c416865c..9d718c537c 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeAngleCone.cpp
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/TransformBus.h>
 #include <AzToolsFramework/Manipulators/AngularManipulator.h>
 #include <AzToolsFramework/Manipulators/LinearManipulator.h>
diff --git a/Gems/PhysX/Code/Editor/EditorSubComponentModeAnglePair.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeAnglePair.cpp
index 4867afde34..79c8bee256 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeAnglePair.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeAnglePair.cpp
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/TransformBus.h>
 #include <AzToolsFramework/Manipulators/ManipulatorManager.h>
 #include <AzToolsFramework/Manipulators/ManipulatorView.h>
diff --git a/Gems/PhysX/Code/Editor/EditorSubComponentModeBase.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeBase.cpp
index f89ffccb03..775430d92a 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeBase.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeBase.cpp
@@ -5,10 +5,10 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
 #include <AzToolsFramework/Viewport/ViewportMessages.h>
 #include <Editor/EditorJointTypeDrawer.h>
 #include <Editor/EditorSubComponentModeBase.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
 
 namespace PhysX
 {
diff --git a/Gems/PhysX/Code/Editor/EditorSubComponentModeLinear.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeLinear.cpp
index f4e17a0a16..0be87567b1 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeLinear.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeLinear.cpp
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/std/smart_ptr/intrusive_ptr.h>
 
diff --git a/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.cpp
index ee0625cf92..3df865f0c9 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeRotation.cpp
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/TransformBus.h>
 #include <AzToolsFramework/Manipulators/AngularManipulator.h>
 #include <AzToolsFramework/Manipulators/ManipulatorManager.h>
diff --git a/Gems/PhysX/Code/Editor/EditorSubComponentModeSnap.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnap.cpp
index 6f8c136736..822d34381d 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeSnap.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnap.cpp
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/TransformBus.h>
 #include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
 #include <AzToolsFramework/Manipulators/LinearManipulator.h>
diff --git a/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapPosition.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapPosition.cpp
index a1791aeaf2..77c2eac55c 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapPosition.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapPosition.cpp
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Math/Color.h>
 #include <AzToolsFramework/Manipulators/LinearManipulator.h>
diff --git a/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.cpp
index 88cef90591..b297ba5220 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeSnapRotation.cpp
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <Editor/EditorJointComponentMode.h>
 #include <Editor/EditorSubComponentModeSnapRotation.h>
 #include <PhysX/EditorJointBus.h>
diff --git a/Gems/PhysX/Code/Editor/EditorSubComponentModeVec3.cpp b/Gems/PhysX/Code/Editor/EditorSubComponentModeVec3.cpp
index 44e0d51aad..5834ecb698 100644
--- a/Gems/PhysX/Code/Editor/EditorSubComponentModeVec3.cpp
+++ b/Gems/PhysX/Code/Editor/EditorSubComponentModeVec3.cpp
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/TransformBus.h>
 #include <AzToolsFramework/Manipulators/ManipulatorManager.h>
 #include <AzToolsFramework/Manipulators/ManipulatorView.h>
diff --git a/Gems/PhysX/Code/Editor/EditorViewportEntityPicker.cpp b/Gems/PhysX/Code/Editor/EditorViewportEntityPicker.cpp
index 85599e04e8..0f21a6522d 100644
--- a/Gems/PhysX/Code/Editor/EditorViewportEntityPicker.cpp
+++ b/Gems/PhysX/Code/Editor/EditorViewportEntityPicker.cpp
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Math/IntersectSegment.h>
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>
 #include <AzFramework/Viewport/CameraState.h>
diff --git a/Gems/PhysX/Code/Editor/EditorWindow.cpp b/Gems/PhysX/Code/Editor/EditorWindow.cpp
index 8d142ca0c4..c2e31d89c7 100644
--- a/Gems/PhysX/Code/Editor/EditorWindow.cpp
+++ b/Gems/PhysX/Code/Editor/EditorWindow.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Interface/Interface.h>
 #include <AzFramework/Physics/CollisionBus.h>
 #include <AzFramework/Physics/SystemBus.h>
diff --git a/Gems/PhysX/Code/Editor/InertiaPropertyHandler.cpp b/Gems/PhysX/Code/Editor/InertiaPropertyHandler.cpp
index d12b61ee1b..d9565f005a 100644
--- a/Gems/PhysX/Code/Editor/InertiaPropertyHandler.cpp
+++ b/Gems/PhysX/Code/Editor/InertiaPropertyHandler.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <Editor/InertiaPropertyHandler.h>
 #include <AzCore/Math/Matrix3x3.h>
 
diff --git a/Gems/PhysX/Code/Editor/MaterialIdWidget.cpp b/Gems/PhysX/Code/Editor/MaterialIdWidget.cpp
index 6e00c8d632..48ba6426cc 100644
--- a/Gems/PhysX/Code/Editor/MaterialIdWidget.cpp
+++ b/Gems/PhysX/Code/Editor/MaterialIdWidget.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <Editor/MaterialIdWidget.h>
 
 #include <AzFramework/Physics/PropertyTypes.h>
diff --git a/Gems/PhysX/Code/Editor/PolygonPrismMeshUtils.cpp b/Gems/PhysX/Code/Editor/PolygonPrismMeshUtils.cpp
index fe0a0973ba..db9f222e6b 100644
--- a/Gems/PhysX/Code/Editor/PolygonPrismMeshUtils.cpp
+++ b/Gems/PhysX/Code/Editor/PolygonPrismMeshUtils.cpp
@@ -5,10 +5,9 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <Editor/PolygonPrismMeshUtils.h>
 #include <AzCore/std/containers/unordered_map.h>
+#include <AzCore/Math/Vector3.h>
 
 namespace PolygonPrismMeshUtils
 {
diff --git a/Gems/PhysX/Code/Editor/PropertyTypes.cpp b/Gems/PhysX/Code/Editor/PropertyTypes.cpp
index 0a476c508c..8663035d92 100644
--- a/Gems/PhysX/Code/Editor/PropertyTypes.cpp
+++ b/Gems/PhysX/Code/Editor/PropertyTypes.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <Editor/CollisionLayerWidget.h>
 #include <Editor/CollisionGroupWidget.h>
 #include <Editor/MaterialIdWidget.h>
diff --git a/Gems/PhysX/Code/Editor/PvdWidget.cpp b/Gems/PhysX/Code/Editor/PvdWidget.cpp
index 133dc59ce1..b5a11b0232 100644
--- a/Gems/PhysX/Code/Editor/PvdWidget.cpp
+++ b/Gems/PhysX/Code/Editor/PvdWidget.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
 #include <AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.h>
diff --git a/Gems/PhysX/Code/Editor/SettingsWidget.cpp b/Gems/PhysX/Code/Editor/SettingsWidget.cpp
index 69e380ef41..f0f758236f 100644
--- a/Gems/PhysX/Code/Editor/SettingsWidget.cpp
+++ b/Gems/PhysX/Code/Editor/SettingsWidget.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.hxx>
 #include <AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.h>
diff --git a/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.cpp b/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.cpp
index 9b0fed8326..976ca34523 100644
--- a/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.cpp
+++ b/Gems/PhysX/Code/Editor/Source/Components/EditorSystemComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include "EditorSystemComponent.h"
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/PhysX/Code/Editor/UniqueStringContainer.cpp b/Gems/PhysX/Code/Editor/UniqueStringContainer.cpp
index ad8d0c79c8..9c50f5b018 100644
--- a/Gems/PhysX/Code/Editor/UniqueStringContainer.cpp
+++ b/Gems/PhysX/Code/Editor/UniqueStringContainer.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "PhysX_precompiled.h"
-
 #include <AzCore/std/string/conversions.h>
 
 #include "UniqueStringContainer.h"
diff --git a/Gems/PhysX/Code/Include/PhysX/Debug/PhysXDebugInterface.h b/Gems/PhysX/Code/Include/PhysX/Debug/PhysXDebugInterface.h
index 376fd85c9c..7ce61755dd 100644
--- a/Gems/PhysX/Code/Include/PhysX/Debug/PhysXDebugInterface.h
+++ b/Gems/PhysX/Code/Include/PhysX/Debug/PhysXDebugInterface.h
@@ -23,7 +23,7 @@ namespace PhysX
         using PvdConfigurationChangedEvent = AZ::Event<const PvdConfiguration&>;
 
         //! Event to notify changes to the Debug display data
-        //! When triggered the event will send the newly applied DEbug display data.
+        //! When triggered the event will send the newly applied Debug display data.
         using DebugDisplayDataChangedEvent = AZ::Event<const DebugDisplayData&>;
 
         //! Interface for interacting with the PhysX Debug options.
diff --git a/Gems/PhysX/Code/Include/PhysX/HeightFieldAsset.cpp b/Gems/PhysX/Code/Include/PhysX/HeightFieldAsset.cpp
index 2d03007151..73664b3f09 100644
--- a/Gems/PhysX/Code/Include/PhysX/HeightFieldAsset.cpp
+++ b/Gems/PhysX/Code/Include/PhysX/HeightFieldAsset.cpp
@@ -5,9 +5,8 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <PhysX/HeightFieldAsset.h>
+#include <PxPhysicsAPI.h>
 
 namespace PhysX
 {
diff --git a/Gems/PhysX/Code/Include/PhysX/Joint/Configuration/PhysXJointConfiguration.h b/Gems/PhysX/Code/Include/PhysX/Joint/Configuration/PhysXJointConfiguration.h
index 9f8f62eef5..ee087b2e8b 100644
--- a/Gems/PhysX/Code/Include/PhysX/Joint/Configuration/PhysXJointConfiguration.h
+++ b/Gems/PhysX/Code/Include/PhysX/Joint/Configuration/PhysXJointConfiguration.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <AzFramework/Physics/Configuration/JointConfiguration.h>
+#include <AzCore/Memory/SystemAllocator.h>
 
 namespace PhysX
 {
diff --git a/Gems/PhysX/Code/Include/PhysX/Utils.inl b/Gems/PhysX/Code/Include/PhysX/Utils.inl
index 353664cb05..b9aa9149a8 100644
--- a/Gems/PhysX/Code/Include/PhysX/Utils.inl
+++ b/Gems/PhysX/Code/Include/PhysX/Utils.inl
@@ -8,6 +8,7 @@
 #include <AzFramework/Physics/PhysicsScene.h>
 #include <AzFramework/Physics/Collision/CollisionGroups.h>
 #include <AzFramework/Physics/Collision/CollisionLayers.h>
+#include <PxPhysicsAPI.h>
 
 namespace PhysX
 {
diff --git a/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/EigenanalysisUtilities.cpp b/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/EigenanalysisUtilities.cpp
index 5460917737..b1eda815df 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/EigenanalysisUtilities.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/EigenanalysisUtilities.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <NumericalMethods_precompiled.h>
-
 #include <cmath>
 
 #include <AzCore/std/algorithm.h>
diff --git a/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Solver3x3.cpp b/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Solver3x3.cpp
index e0751cb725..f45d59f3a2 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Solver3x3.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Eigenanalysis/Solver3x3.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <NumericalMethods_precompiled.h>
-
 #include <algorithm>
 #include <cmath>
 
diff --git a/Gems/PhysX/Code/NumericalMethods/Source/LinearAlgebra.cpp b/Gems/PhysX/Code/NumericalMethods/Source/LinearAlgebra.cpp
index a88f2bf324..9682a56668 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/LinearAlgebra.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Source/LinearAlgebra.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <NumericalMethods_precompiled.h>
 #include <LinearAlgebra.h>
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/Math/MathUtils.h>
diff --git a/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods.cpp b/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods.cpp
index 8f46af84d1..e196f52c38 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <NumericalMethods_precompiled.h>
 #include <NumericalMethods/Eigenanalysis.h>
 #include <NumericalMethods/Optimization.h>
 #include <Optimization/SolverBFGS.h>
diff --git a/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h b/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
deleted file mode 100644
index cc8a920d01..0000000000
--- a/Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
+++ /dev/null
@@ -1,8 +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
diff --git a/Gems/PhysX/Code/NumericalMethods/Source/Optimization/LineSearch.cpp b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/LineSearch.cpp
index 5d737328a7..3801ef9b29 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Optimization/LineSearch.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/LineSearch.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <NumericalMethods_precompiled.h>
 #include <Optimization/LineSearch.h>
 #include <Optimization/Utilities.h>
 #include <Optimization/Constants.h>
diff --git a/Gems/PhysX/Code/NumericalMethods/Source/Optimization/SolverBFGS.cpp b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/SolverBFGS.cpp
index c9de544801..a260426024 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Optimization/SolverBFGS.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/SolverBFGS.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <NumericalMethods_precompiled.h>
 #include <Optimization/SolverBFGS.h>
 #include <Optimization/LineSearch.h>
 #include <Optimization/Utilities.h>
diff --git a/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Utilities.cpp b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Utilities.cpp
index ad3df6e567..e7632e5ccf 100644
--- a/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Utilities.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Source/Optimization/Utilities.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <NumericalMethods_precompiled.h>
 #include <NumericalMethods/Optimization.h>
 #include <Optimization/Constants.h>
 #include <Optimization/Utilities.h>
diff --git a/Gems/PhysX/Code/NumericalMethods/Tests/CommonTest.cpp b/Gems/PhysX/Code/NumericalMethods/Tests/CommonTest.cpp
index 20db25bc0f..b08d99f9f4 100644
--- a/Gems/PhysX/Code/NumericalMethods/Tests/CommonTest.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Tests/CommonTest.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <NumericalMethods_precompiled.h>
 #include <Tests/Environment.h>
 #include <AzTest/AzTest.h>
 #include <LinearAlgebra.h>
diff --git a/Gems/PhysX/Code/NumericalMethods/Tests/EigenanalysisTest.cpp b/Gems/PhysX/Code/NumericalMethods/Tests/EigenanalysisTest.cpp
index 00272fd78e..46a5acdd05 100644
--- a/Gems/PhysX/Code/NumericalMethods/Tests/EigenanalysisTest.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Tests/EigenanalysisTest.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <NumericalMethods_precompiled.h>
 #include <AzTest/AzTest.h>
 #include <AzCore/std/containers/array.h>
 #include <AzCore/std/utils.h>
diff --git a/Gems/PhysX/Code/NumericalMethods/Tests/Environment.cpp b/Gems/PhysX/Code/NumericalMethods/Tests/Environment.cpp
index fc286d3f1e..71af4fa95c 100644
--- a/Gems/PhysX/Code/NumericalMethods/Tests/Environment.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Tests/Environment.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <NumericalMethods_precompiled.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzTest/AzTest.h>
 #include <AzCore/Memory/SystemAllocator.h>
diff --git a/Gems/PhysX/Code/NumericalMethods/Tests/OptimizationTest.cpp b/Gems/PhysX/Code/NumericalMethods/Tests/OptimizationTest.cpp
index b5e9278a6e..125d440b8b 100644
--- a/Gems/PhysX/Code/NumericalMethods/Tests/OptimizationTest.cpp
+++ b/Gems/PhysX/Code/NumericalMethods/Tests/OptimizationTest.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <NumericalMethods_precompiled.h>
 #include <AzTest/AzTest.h>
 #include <NumericalMethods/Optimization.h>
 #include <Optimization/SolverBFGS.h>
diff --git a/Gems/PhysX/Code/NumericalMethods/numericalmethods_files.cmake b/Gems/PhysX/Code/NumericalMethods/numericalmethods_files.cmake
index c0750c640b..f21d6e218d 100644
--- a/Gems/PhysX/Code/NumericalMethods/numericalmethods_files.cmake
+++ b/Gems/PhysX/Code/NumericalMethods/numericalmethods_files.cmake
@@ -6,7 +6,6 @@
 #
 
 set(FILES
-    Source/NumericalMethods_precompiled.h
     Include/NumericalMethods/Optimization.h
     Include/NumericalMethods/Eigenanalysis.h
     Source/Optimization/Constants.h
diff --git a/Gems/PhysX/Code/Source/BallJointComponent.cpp b/Gems/PhysX/Code/Source/BallJointComponent.cpp
index f924993b1d..5057d75224 100644
--- a/Gems/PhysX/Code/Source/BallJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/BallJointComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <Source/BallJointComponent.h>
 #include <PhysX/MathConversion.h>
 #include <PhysX/PhysXLocks.h>
diff --git a/Gems/PhysX/Code/Source/BaseColliderComponent.cpp b/Gems/PhysX/Code/Source/BaseColliderComponent.cpp
index 1b2e5a52db..a819bb006f 100644
--- a/Gems/PhysX/Code/Source/BaseColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/BaseColliderComponent.cpp
@@ -6,8 +6,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzFramework/Physics/RigidBodyBus.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Component/TransformBus.h>
@@ -22,6 +20,7 @@
 #include <Source/StaticRigidBodyComponent.h>
 #include <Source/SystemComponent.h>
 #include <Source/Utils.h>
+#include <PhysX/MathConversion.h>
 #include <PhysX/PhysXLocks.h>
 #include <Scene/PhysXScene.h>
 
diff --git a/Gems/PhysX/Code/Source/BoxColliderComponent.cpp b/Gems/PhysX/Code/Source/BoxColliderComponent.cpp
index 6c8de25e39..9d23afdb38 100644
--- a/Gems/PhysX/Code/Source/BoxColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/BoxColliderComponent.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
diff --git a/Gems/PhysX/Code/Source/CapsuleColliderComponent.cpp b/Gems/PhysX/Code/Source/CapsuleColliderComponent.cpp
index befb6d1e96..678e5b66d5 100644
--- a/Gems/PhysX/Code/Source/CapsuleColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/CapsuleColliderComponent.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
diff --git a/Gems/PhysX/Code/Source/Collision.cpp b/Gems/PhysX/Code/Source/Collision.cpp
index 954445c379..291f8acf5f 100644
--- a/Gems/PhysX/Code/Source/Collision.cpp
+++ b/Gems/PhysX/Code/Source/Collision.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <Source/Collision.h>
 #include <PhysX/Utils.h>
 #include <AzFramework/Physics/Collision/CollisionGroups.h>
diff --git a/Gems/PhysX/Code/Source/Collision.h b/Gems/PhysX/Code/Source/Collision.h
index 12782d52ac..82913d9a7d 100644
--- a/Gems/PhysX/Code/Source/Collision.h
+++ b/Gems/PhysX/Code/Source/Collision.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <PxPhysicsAPI.h>
+#include <AzCore/base.h>
 
 namespace AzPhysics
 {
diff --git a/Gems/PhysX/Code/Source/ComponentDescriptors.cpp b/Gems/PhysX/Code/Source/ComponentDescriptors.cpp
index 69ab3de985..749a355c82 100644
--- a/Gems/PhysX/Code/Source/ComponentDescriptors.cpp
+++ b/Gems/PhysX/Code/Source/ComponentDescriptors.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "PhysX_precompiled.h"
-
 #include <ComponentDescriptors.h>
 #include <Source/SystemComponent.h>
 #include <Source/RigidBodyComponent.h>
diff --git a/Gems/PhysX/Code/Source/Configuration/PhysXConfiguration.cpp b/Gems/PhysX/Code/Source/Configuration/PhysXConfiguration.cpp
index a77e38638f..ae06dd63e2 100644
--- a/Gems/PhysX/Code/Source/Configuration/PhysXConfiguration.cpp
+++ b/Gems/PhysX/Code/Source/Configuration/PhysXConfiguration.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <PhysX/Configuration/PhysXConfiguration.h>
 
 #include <AzCore/Memory/SystemAllocator.h>
diff --git a/Gems/PhysX/Code/Source/Configuration/PhysXSettingsRegistryManager.cpp b/Gems/PhysX/Code/Source/Configuration/PhysXSettingsRegistryManager.cpp
index b4ae54ad71..953612f082 100644
--- a/Gems/PhysX/Code/Source/Configuration/PhysXSettingsRegistryManager.cpp
+++ b/Gems/PhysX/Code/Source/Configuration/PhysXSettingsRegistryManager.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <Configuration/PhysXSettingsRegistryManager.h>
 
 #include <AzCore/Settings/SettingsRegistry.h>
diff --git a/Gems/PhysX/Code/Source/Debug/Configuration/PhysXDebugConfiguration.cpp b/Gems/PhysX/Code/Source/Debug/Configuration/PhysXDebugConfiguration.cpp
index 33efc73037..db47f2345e 100644
--- a/Gems/PhysX/Code/Source/Debug/Configuration/PhysXDebugConfiguration.cpp
+++ b/Gems/PhysX/Code/Source/Debug/Configuration/PhysXDebugConfiguration.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <PhysX/Debug/PhysXDebugConfiguration.h>
 
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/PhysX/Code/Source/Debug/PhysXDebug.cpp b/Gems/PhysX/Code/Source/Debug/PhysXDebug.cpp
index f7be2549ba..2b3956d931 100644
--- a/Gems/PhysX/Code/Source/Debug/PhysXDebug.cpp
+++ b/Gems/PhysX/Code/Source/Debug/PhysXDebug.cpp
@@ -5,13 +5,14 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
+#include <AzCore/std/functional.h>
 #include <Debug/PhysXDebug.h>
 
 #include <AzFramework/API/ApplicationAPI.h>
 #include <AzFramework/StringFunc/StringFunc.h>
+#include <AzCore/std/string/conversions.h>
 #include <PxPhysicsAPI.h>
+#include <AzCore/Component/ComponentApplicationBus.h>
 
 namespace PhysX
 {
diff --git a/Gems/PhysX/Code/Source/DefaultWorldComponent.cpp b/Gems/PhysX/Code/Source/DefaultWorldComponent.cpp
index 6973dcca44..92d81b7564 100644
--- a/Gems/PhysX/Code/Source/DefaultWorldComponent.cpp
+++ b/Gems/PhysX/Code/Source/DefaultWorldComponent.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <DefaultWorldComponent.h>
 #include <AzFramework/Physics/PhysicsSystem.h>
 #include <AzFramework/Physics/Collision/CollisionEvents.h>
diff --git a/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp b/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp
index 75c797c9de..793b5a9a8b 100644
--- a/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorBallJointComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Math/IntersectSegment.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/PhysX/Code/Source/EditorColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
index 46598a13a4..6e68cf479b 100644
--- a/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorColliderComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Script/ScriptTimePoint.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
diff --git a/Gems/PhysX/Code/Source/EditorComponentDescriptors.cpp b/Gems/PhysX/Code/Source/EditorComponentDescriptors.cpp
index 927879bc40..9659eade52 100644
--- a/Gems/PhysX/Code/Source/EditorComponentDescriptors.cpp
+++ b/Gems/PhysX/Code/Source/EditorComponentDescriptors.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "PhysX_precompiled.h"
-
 #include <Source/EditorComponentDescriptors.h>
 
 #include <Source/EditorBallJointComponent.h>
diff --git a/Gems/PhysX/Code/Source/EditorFixedJointComponent.cpp b/Gems/PhysX/Code/Source/EditorFixedJointComponent.cpp
index 8e8ec630fa..508b090633 100644
--- a/Gems/PhysX/Code/Source/EditorFixedJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorFixedJointComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Math/IntersectSegment.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp b/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp
index 9a4c8a9df1..1332b1725d 100644
--- a/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorForceRegionComponent.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <Source/EditorColliderComponent.h>
 #include <Source/EditorShapeColliderComponent.h>
 #include <Source/EditorForceRegionComponent.h>
diff --git a/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp b/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp
index 615ae0d909..398efe01f4 100644
--- a/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorHingeJointComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Math/IntersectSegment.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/PhysX/Code/Source/EditorJointComponent.cpp b/Gems/PhysX/Code/Source/EditorJointComponent.cpp
index 026f2252be..32dd4d5136 100644
--- a/Gems/PhysX/Code/Source/EditorJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorJointComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Math/IntersectSegment.h>
diff --git a/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp b/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
index 303c34d66b..ad6c602056 100644
--- a/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorRigidBodyComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzFramework/Physics/NameConstants.h>
diff --git a/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp b/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
index 491c6f712b..c7c27e4d79 100644
--- a/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/EditorShapeColliderComponent.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <EditorShapeColliderComponent.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzFramework/Physics/ColliderComponentBus.h>
@@ -25,6 +24,7 @@
 #include <PhysX/SystemComponentBus.h>
 #include <Source/Utils.h>
 #include <AzCore/Math/Geometry2DUtils.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
 #include <cmath>
 
 #include <RigidBodyStatic.h>
diff --git a/Gems/PhysX/Code/Source/FixedJointComponent.cpp b/Gems/PhysX/Code/Source/FixedJointComponent.cpp
index bab6bc1d32..1a23396b2f 100644
--- a/Gems/PhysX/Code/Source/FixedJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/FixedJointComponent.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <Source/FixedJointComponent.h>
 #include <PhysX/MathConversion.h>
 #include <PhysX/PhysXLocks.h>
diff --git a/Gems/PhysX/Code/Source/ForceRegion.cpp b/Gems/PhysX/Code/Source/ForceRegion.cpp
index 74bf194481..2077b1209b 100644
--- a/Gems/PhysX/Code/Source/ForceRegion.cpp
+++ b/Gems/PhysX/Code/Source/ForceRegion.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "PhysX_precompiled.h"
-
 #include <Source/ForceRegion.h>
 
 #include <PhysX/ColliderShapeBus.h>
diff --git a/Gems/PhysX/Code/Source/ForceRegionComponent.cpp b/Gems/PhysX/Code/Source/ForceRegionComponent.cpp
index 7d3935b307..d993b937ff 100644
--- a/Gems/PhysX/Code/Source/ForceRegionComponent.cpp
+++ b/Gems/PhysX/Code/Source/ForceRegionComponent.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "PhysX_precompiled.h"
-
 #include <Source/ForceRegionComponent.h>
 #include <Source/ForceRegionForces.h>
 
diff --git a/Gems/PhysX/Code/Source/ForceRegionForces.cpp b/Gems/PhysX/Code/Source/ForceRegionForces.cpp
index 9aae06429e..9caa7629ff 100644
--- a/Gems/PhysX/Code/Source/ForceRegionForces.cpp
+++ b/Gems/PhysX/Code/Source/ForceRegionForces.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "PhysX_precompiled.h"
 #include "ForceRegionForces.h"
 
 namespace PhysX
diff --git a/Gems/PhysX/Code/Source/ForceRegionForces.h b/Gems/PhysX/Code/Source/ForceRegionForces.h
index b1db67340a..20296cfb74 100644
--- a/Gems/PhysX/Code/Source/ForceRegionForces.h
+++ b/Gems/PhysX/Code/Source/ForceRegionForces.h
@@ -10,6 +10,7 @@
 #include <AzCore/Math/Spline.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <PhysX/ForceRegionComponentBus.h>
+#include <AzCore/Math/Aabb.h>
 
 namespace PhysX
 {
diff --git a/Gems/PhysX/Code/Source/HingeJointComponent.cpp b/Gems/PhysX/Code/Source/HingeJointComponent.cpp
index 700ffc77f9..1e4af953fc 100644
--- a/Gems/PhysX/Code/Source/HingeJointComponent.cpp
+++ b/Gems/PhysX/Code/Source/HingeJointComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <Source/HingeJointComponent.h>
 #include <PhysX/MathConversion.h>
 #include <PhysX/PhysXLocks.h>
diff --git a/Gems/PhysX/Code/Source/Joint/Configuration/PhysXJointConfiguration.cpp b/Gems/PhysX/Code/Source/Joint/Configuration/PhysXJointConfiguration.cpp
index b4ad5a4ae5..307d1e8f92 100644
--- a/Gems/PhysX/Code/Source/Joint/Configuration/PhysXJointConfiguration.cpp
+++ b/Gems/PhysX/Code/Source/Joint/Configuration/PhysXJointConfiguration.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <PhysX/Joint/Configuration/PhysXJointConfiguration.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzFramework/Physics/Common/PhysicsSimulatedBody.h>
diff --git a/Gems/PhysX/Code/Source/Joint/PhysXJoint.cpp b/Gems/PhysX/Code/Source/Joint/PhysXJoint.cpp
index 460a09de0e..a3011fc515 100644
--- a/Gems/PhysX/Code/Source/Joint/PhysXJoint.cpp
+++ b/Gems/PhysX/Code/Source/Joint/PhysXJoint.cpp
@@ -5,13 +5,13 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <Joint/PhysXJoint.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <Include/PhysX/NativeTypeIdentifiers.h>
 #include <AzCore/Math/MathUtils.h>
 #include <AzFramework/Physics/Common/PhysicsSimulatedBody.h>
 #include <Source/Joint/PhysXJointUtils.h>
+#include <PhysX/MathConversion.h>
 
 namespace PhysX
 {
diff --git a/Gems/PhysX/Code/Source/Joint/PhysXJointUtils.cpp b/Gems/PhysX/Code/Source/Joint/PhysXJointUtils.cpp
index 7e76a8400a..916a8a0ddb 100644
--- a/Gems/PhysX/Code/Source/Joint/PhysXJointUtils.cpp
+++ b/Gems/PhysX/Code/Source/Joint/PhysXJointUtils.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzFramework/Physics/PhysicsScene.h>
 #include <AzFramework/Physics/PhysicsSystem.h>
 #include <AzFramework/Physics/Common/PhysicsSimulatedBody.h>
@@ -14,6 +12,8 @@
 
 #include <PhysX/Joint/Configuration/PhysXJointConfiguration.h>
 #include <PhysX/PhysXLocks.h>
+#include <PhysX/Debug/PhysXDebugConfiguration.h>
+#include <PhysX/MathConversion.h>
 #include <Source/Joint/PhysXJointUtils.h>
 #include <Include/PhysX/NativeTypeIdentifiers.h>
 
diff --git a/Gems/PhysX/Code/Source/JointComponent.cpp b/Gems/PhysX/Code/Source/JointComponent.cpp
index 18809a6c4b..4111406ded 100644
--- a/Gems/PhysX/Code/Source/JointComponent.cpp
+++ b/Gems/PhysX/Code/Source/JointComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/ComponentApplicationBus.h>
 #include <AzFramework/Physics/RigidBodyBus.h>
 #include <AzFramework/Physics/Common/PhysicsSimulatedBody.h>
@@ -16,6 +14,7 @@
 #include <Source/JointComponent.h>
 #include <Source/Utils.h>
 #include <AzFramework/Physics/PhysicsSystem.h>
+#include <PhysX/MathConversion.h>
 
 namespace PhysX
 {
diff --git a/Gems/PhysX/Code/Source/JointComponent.h b/Gems/PhysX/Code/Source/JointComponent.h
index c02a82c688..b15db009c2 100644
--- a/Gems/PhysX/Code/Source/JointComponent.h
+++ b/Gems/PhysX/Code/Source/JointComponent.h
@@ -12,6 +12,7 @@
 #include <AzCore/Component/EntityBus.h>
 #include <AzCore/Component/EntityId.h>
 #include <AzCore/Component/TransformBus.h>
+#include <AzFramework/Physics/Common/PhysicsTypes.h>
 
 #include <PhysX/Joint/Configuration/PhysXJointConfiguration.h>
 
diff --git a/Gems/PhysX/Code/Source/Material.cpp b/Gems/PhysX/Code/Source/Material.cpp
index 0f55dd4e20..e6c1fe40e2 100644
--- a/Gems/PhysX/Code/Source/Material.cpp
+++ b/Gems/PhysX/Code/Source/Material.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include "Material.h"
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <PxPhysicsAPI.h>
diff --git a/Gems/PhysX/Code/Source/MeshColliderComponent.cpp b/Gems/PhysX/Code/Source/MeshColliderComponent.cpp
index 16d051a2e5..594087907e 100644
--- a/Gems/PhysX/Code/Source/MeshColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/MeshColliderComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/PhysX/Code/Source/Module.cpp b/Gems/PhysX/Code/Source/Module.cpp
index e36ce0ecd9..0f6dab14b7 100644
--- a/Gems/PhysX/Code/Source/Module.cpp
+++ b/Gems/PhysX/Code/Source/Module.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Module/Module.h>
 #include <AzCore/Module/DynamicModuleHandle.h>
 #include <AzCore/Component/ComponentApplicationBus.h>
diff --git a/Gems/PhysX/Code/Source/ModuleUnsupported.cpp b/Gems/PhysX/Code/Source/ModuleUnsupported.cpp
index 434ea7a9ec..93cf78f0bc 100644
--- a/Gems/PhysX/Code/Source/ModuleUnsupported.cpp
+++ b/Gems/PhysX/Code/Source/ModuleUnsupported.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysXUnsupported_precompiled.h>
-
 #include <AzCore/Module/Module.h>
 
 // DO NOT MODIFY THIS LINE UNLESS YOU RENAME THE GEM
diff --git a/Gems/PhysX/Code/Source/NameConstants.cpp b/Gems/PhysX/Code/Source/NameConstants.cpp
index c44c5d5974..39f288f4bd 100644
--- a/Gems/PhysX/Code/Source/NameConstants.cpp
+++ b/Gems/PhysX/Code/Source/NameConstants.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <NameConstants.h>
 
 namespace PhysX
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterController.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterController.cpp
index 54328dd0c2..c39766a13e 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterController.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterController.cpp
@@ -5,8 +5,8 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <AzCore/Serialization/EditContext.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzFramework/Physics/CollisionBus.h>
 #include <AzFramework/Physics/PhysicsScene.h>
 #include <AzFramework/Physics/Shape.h>
@@ -16,6 +16,8 @@
 #include <PhysX/Utils.h>
 #include <PhysX/NativeTypeIdentifiers.h>
 #include <PhysX/PhysXLocks.h>
+#include <PhysX/Debug/PhysXDebugConfiguration.h>
+#include <PhysX/MathConversion.h>
 #include <PhysXCharacters/API/CharacterController.h>
 #include <Source/Collision.h>
 #include <Source/Shape.h>
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp
index 25acd20ad6..c0569fef9e 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <PhysXCharacters/API/CharacterUtils.h>
 #include <PhysXCharacters/API/CharacterController.h>
 #include <PhysXCharacters/API/Ragdoll.h>
@@ -14,6 +13,8 @@
 #include <cfloat>
 #include <PhysX/PhysXLocks.h>
 #include <PhysX/Joint/Configuration/PhysXJointConfiguration.h>
+#include <PhysX/Debug/PhysXDebugConfiguration.h>
+#include <PhysX/MathConversion.h>
 #include <Source/RigidBody.h>
 #include <Source/Scene/PhysXScene.h>
 #include <Source/Shape.h>
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h
index 4907329746..d10c70269e 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h
@@ -6,10 +6,12 @@
  */
 
 #pragma once
+
 #include <AzFramework/Physics/Ragdoll.h>
 #include <AzFramework/Physics/Common/PhysicsTypes.h>
 #include <PhysXCharacters/API/Ragdoll.h>
 #include <AzCore/Outcome/Outcome.h>
+#include <PxPhysicsAPI.h>
 
 namespace Physics
 {
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp
index 653d97bd06..d4eeb35035 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzCore/std/parallel/scoped_lock.h>
@@ -16,6 +15,7 @@
 #include <PhysXCharacters/API/CharacterUtils.h>
 #include <PhysX/NativeTypeIdentifiers.h>
 #include <PhysX/PhysXLocks.h>
+#include <PhysX/MathConversion.h>
 #include <Scene/PhysXScene.h>
 
 namespace PhysX
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.cpp
index bf7b0796c3..d1b2af9707 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.cpp
@@ -5,12 +5,15 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzFramework/Physics/PhysicsScene.h>
 #include <AzFramework/Physics/Common/PhysicsSceneQueries.h>
 #include <PhysXCharacters/API/RagdollNode.h>
 #include <PhysX/NativeTypeIdentifiers.h>
+#include <PhysX/Debug/PhysXDebugConfiguration.h>
+#include <PhysX/MathConversion.h>
+
+#include <PxPhysicsAPI.h>
 
 namespace PhysX
 {
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp
index ff7ec66140..e6d80d7db8 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/RTTI/BehaviorContext.h>
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.cpp
index 4bc2720b07..a1638fef0b 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterGameplayComponent.cpp
@@ -5,13 +5,13 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <PhysXCharacters/Components/CharacterGameplayComponent.h>
 #include <AzFramework/Physics/CharacterBus.h>
 #include <AzFramework/Physics/Common/PhysicsSimulatedBody.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <PhysX/PhysXLocks.h>
 #include <PhysX/Utils.h>
+#include <PhysX/Debug/PhysXDebugConfiguration.h>
 #include <System/PhysXSystem.h>
 
 namespace PhysX
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp
index 94a7db5627..5bc5a81c97 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/EditorCharacterControllerComponent.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzFramework/Viewport/ViewportColors.h>
 #include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
index a975e984da..4588171fdb 100644
--- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
+++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/Entity.h>
 #include <PhysXCharacters/API/CharacterUtils.h>
 #include <AzCore/Component/TransformBus.h>
diff --git a/Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h b/Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
deleted file mode 100644
index cc8a920d01..0000000000
--- a/Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
+++ /dev/null
@@ -1,8 +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
diff --git a/Gems/PhysX/Code/Source/PhysX_precompiled.h b/Gems/PhysX/Code/Source/PhysX_precompiled.h
deleted file mode 100644
index 27096b4e66..0000000000
--- a/Gems/PhysX/Code/Source/PhysX_precompiled.h
+++ /dev/null
@@ -1,21 +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/Math/ToString.h>
-
-#include <PhysX/MathConversion.h>
-#include <PxPhysicsAPI.h>
-#include <AzCore/std/smart_ptr/make_shared.h>
-#include <AzCore/std/containers/vector.h>
-
-#include <AzFramework/Physics/Common/PhysicsTypes.h>
-
-#ifndef _RELEASE
-#define AZ_PHYSICS_DEBUG_ENABLED
-#endif
diff --git a/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.cpp b/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.cpp
index 51cf461f26..35ab876462 100644
--- a/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/HeightFieldAssetHandler.cpp
@@ -6,8 +6,6 @@
  */
 
 
-#include <PhysX_precompiled.h>
-
 #include <Pipeline/HeightFieldAssetHandler.h>
 #include <Pipeline/StreamWrapper.h>
 #include <AzCore/IO/GenericStreams.h>
@@ -16,6 +14,7 @@
 #include <PhysX/SystemComponentBus.h>
 #include <PhysX/ComponentTypeIds.h>
 #include <Source/Pipeline/HeightFieldAssetHandler.h>
+#include <PxPhysicsAPI.h>
 
 #include <extensions/PxSerialization.h>
 #include <extensions/PxDefaultStreams.h>
diff --git a/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp b/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp
index a04b9327ac..bf188515d6 100644
--- a/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/MeshAssetHandler.cpp
@@ -6,8 +6,6 @@
  */
 
 
-#include <PhysX_precompiled.h>
-
 #include <Pipeline/MeshAssetHandler.h>
 #include <AzCore/IO/GenericStreams.h>
 #include <AzCore/IO/FileIO.h>
diff --git a/Gems/PhysX/Code/Source/Pipeline/MeshBehavior.cpp b/Gems/PhysX/Code/Source/Pipeline/MeshBehavior.cpp
index 299e5cdd23..70bb5f1652 100644
--- a/Gems/PhysX/Code/Source/Pipeline/MeshBehavior.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/MeshBehavior.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/std/algorithm.h>
 #include <AzCore/std/smart_ptr/make_shared.h>
diff --git a/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp b/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp
index 93fd1c6f2d..267d7d4076 100644
--- a/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/MeshExporter.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzFramework/StringFunc/StringFunc.h>
 #include <AzToolsFramework/Debug/TraceContext.h>
 #include <SceneAPI/SceneCore/Containers/Utilities/Filters.h>
@@ -36,6 +34,7 @@
 #include <AzCore/Math/Matrix3x3.h>
 #include <AzCore/XML/rapidxml.h>
 #include <AzCore/std/algorithm.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
 #include <GFxFramework/MaterialIO/Material.h>
 
 // A utility macro helping set/clear bits in a single line
diff --git a/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp b/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp
index e0d9eb1e96..b46855b511 100644
--- a/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/MeshGroup.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/RTTI/ReflectContext.h>
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/AbstractShapeParameterization.cpp b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/AbstractShapeParameterization.cpp
index 7c667e1afa..d31cffe423 100644
--- a/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/AbstractShapeParameterization.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/AbstractShapeParameterization.cpp
@@ -5,11 +5,10 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <algorithm>
 
 #include <AzCore/std/algorithm.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
 
 #include <Source/Pipeline/PrimitiveShapeFitter/AbstractShapeParameterization.h>
 
diff --git a/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/PrimitiveShapeFitter.cpp b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/PrimitiveShapeFitter.cpp
index baa550b06e..f9589cf1c4 100644
--- a/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/PrimitiveShapeFitter.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/PrimitiveShapeFitter.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/std/sort.h>
 
 #include <SceneAPI/SceneCore/Utilities/Reporting.h>
diff --git a/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/Utils.cpp b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/Utils.cpp
index 953c7e6d51..4b89e88137 100644
--- a/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/Utils.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/PrimitiveShapeFitter/Utils.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Math/MathUtils.h>
 #include <AzCore/Math/Matrix3x3.h>
 
diff --git a/Gems/PhysX/Code/Source/Pipeline/StreamWrapper.cpp b/Gems/PhysX/Code/Source/Pipeline/StreamWrapper.cpp
index 15d644b812..f68c138e1c 100644
--- a/Gems/PhysX/Code/Source/Pipeline/StreamWrapper.cpp
+++ b/Gems/PhysX/Code/Source/Pipeline/StreamWrapper.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <Pipeline/StreamWrapper.h>
 
 namespace PhysX
diff --git a/Gems/PhysX/Code/Source/RigidBody.cpp b/Gems/PhysX/Code/Source/RigidBody.cpp
index 5ffcba7aa8..73781d0f43 100644
--- a/Gems/PhysX/Code/Source/RigidBody.cpp
+++ b/Gems/PhysX/Code/Source/RigidBody.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzFramework/Physics/Utils.h>
diff --git a/Gems/PhysX/Code/Source/RigidBodyComponent.cpp b/Gems/PhysX/Code/Source/RigidBodyComponent.cpp
index 1ffb4b9a49..584257c235 100644
--- a/Gems/PhysX/Code/Source/RigidBodyComponent.cpp
+++ b/Gems/PhysX/Code/Source/RigidBodyComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/std/containers/vector.h>
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Math/Transform.h>
diff --git a/Gems/PhysX/Code/Source/RigidBodyStatic.cpp b/Gems/PhysX/Code/Source/RigidBodyStatic.cpp
index 26125fd317..3b483bb8ce 100644
--- a/Gems/PhysX/Code/Source/RigidBodyStatic.cpp
+++ b/Gems/PhysX/Code/Source/RigidBodyStatic.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzFramework/Physics/Configuration/StaticRigidBodyConfiguration.h>
 #include <PxPhysicsAPI.h>
@@ -17,6 +15,7 @@
 #include <Include/PhysX/NativeTypeIdentifiers.h>
 #include <PhysX/PhysXLocks.h>
 #include <Common/PhysXSceneQueryHelpers.h>
+#include <PhysX/MathConversion.h>
 
 namespace PhysX
 {
diff --git a/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp b/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp
index 7dfa9c5f78..523600ab42 100644
--- a/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp
+++ b/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp
@@ -4,13 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <Scene/PhysXScene.h>
 
 #include <AzCore/Debug/ProfilerBus.h>
 #include <AzCore/std/containers/variant.h>
 #include <AzCore/std/containers/vector.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzFramework/Physics/Character.h>
 #include <AzFramework/Physics/Collision/CollisionEvents.h>
 #include <AzFramework/Physics/Configuration/RigidBodyConfiguration.h>
@@ -27,6 +26,8 @@
 #include <PhysXCharacters/API/CharacterUtils.h>
 #include <System/PhysXSystem.h>
 #include <PhysX/Joint/Configuration/PhysXJointConfiguration.h>
+#include <PhysX/Debug/PhysXDebugConfiguration.h>
+#include <PhysX/MathConversion.h>
 #include <Joint/PhysXJoint.h>
 
 namespace PhysX
diff --git a/Gems/PhysX/Code/Source/Scene/PhysXScene.h b/Gems/PhysX/Code/Source/Scene/PhysXScene.h
index 9592ab1570..4b43731f22 100644
--- a/Gems/PhysX/Code/Source/Scene/PhysXScene.h
+++ b/Gems/PhysX/Code/Source/Scene/PhysXScene.h
@@ -17,7 +17,11 @@
 
 namespace physx
 {
+    class PxControllerManager;
+    struct PxOverlapHit;
+    struct PxRaycastHit;
     class PxScene;
+    struct PxSweepHit;
 }
 
 namespace PhysX
diff --git a/Gems/PhysX/Code/Source/Shape.cpp b/Gems/PhysX/Code/Source/Shape.cpp
index 77d0cbc642..1ece29933c 100644
--- a/Gems/PhysX/Code/Source/Shape.cpp
+++ b/Gems/PhysX/Code/Source/Shape.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <Source/Shape.h>
 
 #include <AzFramework/Physics/Common/PhysicsSceneQueries.h>
@@ -16,6 +15,7 @@
 #include <Source/Collision.h>
 #include <Source/Material.h>
 #include <Source/Utils.h>
+#include <PhysX/MathConversion.h>
 
 namespace PhysX
 {
diff --git a/Gems/PhysX/Code/Source/ShapeColliderComponent.cpp b/Gems/PhysX/Code/Source/ShapeColliderComponent.cpp
index 9491b05e49..7ab66860ef 100644
--- a/Gems/PhysX/Code/Source/ShapeColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/ShapeColliderComponent.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <ShapeColliderComponent.h>
 #include <LmbrCentral/Shape/ShapeComponentBus.h>
 #include <LmbrCentral/Shape/BoxShapeComponentBus.h>
diff --git a/Gems/PhysX/Code/Source/SphereColliderComponent.cpp b/Gems/PhysX/Code/Source/SphereColliderComponent.cpp
index 91bff6d660..1b4037b3c0 100644
--- a/Gems/PhysX/Code/Source/SphereColliderComponent.cpp
+++ b/Gems/PhysX/Code/Source/SphereColliderComponent.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <Source/SphereColliderComponent.h>
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/PhysX/Code/Source/StaticRigidBodyComponent.cpp b/Gems/PhysX/Code/Source/StaticRigidBodyComponent.cpp
index 5742dba87d..a4595396d1 100644
--- a/Gems/PhysX/Code/Source/StaticRigidBodyComponent.cpp
+++ b/Gems/PhysX/Code/Source/StaticRigidBodyComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <Source/StaticRigidBodyComponent.h>
 #include <Source/RigidBodyStatic.h>
 #include <Source/Utils.h>
diff --git a/Gems/PhysX/Code/Source/System/PhysXCpuDispatcher.cpp b/Gems/PhysX/Code/Source/System/PhysXCpuDispatcher.cpp
index 6e8fcdd3bd..8987f5c3ef 100644
--- a/Gems/PhysX/Code/Source/System/PhysXCpuDispatcher.cpp
+++ b/Gems/PhysX/Code/Source/System/PhysXCpuDispatcher.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <System/PhysXCpuDispatcher.h>
 #include <System/PhysXJob.h>
 
diff --git a/Gems/PhysX/Code/Source/System/PhysXJob.cpp b/Gems/PhysX/Code/Source/System/PhysXJob.cpp
index d8f1a2da08..f7579aefdc 100644
--- a/Gems/PhysX/Code/Source/System/PhysXJob.cpp
+++ b/Gems/PhysX/Code/Source/System/PhysXJob.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <System/PhysXJob.h>
 #include <AzCore/Debug/Profiler.h>
 
diff --git a/Gems/PhysX/Code/Source/System/PhysXJointInterface.cpp b/Gems/PhysX/Code/Source/System/PhysXJointInterface.cpp
index b50617b4a7..44a5e5e0eb 100644
--- a/Gems/PhysX/Code/Source/System/PhysXJointInterface.cpp
+++ b/Gems/PhysX/Code/Source/System/PhysXJointInterface.cpp
@@ -9,6 +9,7 @@
 #include <AzFramework/Physics/Configuration/JointConfiguration.h>
 
 #include <PhysX/Joint/Configuration/PhysXJointConfiguration.h>
+#include <PhysX/Debug/PhysXDebugConfiguration.h>
 
 namespace PhysX
 {
diff --git a/Gems/PhysX/Code/Source/System/PhysXSystem.cpp b/Gems/PhysX/Code/Source/System/PhysXSystem.cpp
index 24f0895eb8..ae584a15b4 100644
--- a/Gems/PhysX/Code/Source/System/PhysXSystem.cpp
+++ b/Gems/PhysX/Code/Source/System/PhysXSystem.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Math/MathUtils.h>
 #include <AzCore/Memory/SystemAllocator.h>
 
@@ -13,6 +11,7 @@
 #include <System/PhysXSystem.h>
 #include <System/PhysXAllocator.h>
 #include <System/PhysXCpuDispatcher.h>
+#include <PhysX/Debug/PhysXDebugConfiguration.h>
 
 #include <PxPhysicsAPI.h>
 
diff --git a/Gems/PhysX/Code/Source/SystemComponent.cpp b/Gems/PhysX/Code/Source/SystemComponent.cpp
index 3aa416b70b..251a9df0ba 100644
--- a/Gems/PhysX/Code/Source/SystemComponent.cpp
+++ b/Gems/PhysX/Code/Source/SystemComponent.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
 #include <Source/SystemComponent.h>
 
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/PhysX/Code/Source/Utils.cpp b/Gems/PhysX/Code/Source/Utils.cpp
index 92af5b9855..236c9bfc3e 100644
--- a/Gems/PhysX/Code/Source/Utils.cpp
+++ b/Gems/PhysX/Code/Source/Utils.cpp
@@ -5,8 +5,7 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
+#include <AzCore/std/smart_ptr/make_shared.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Component/NonUniformScaleBus.h>
 #include <AzCore/EBus/Results.h>
@@ -15,6 +14,7 @@
 #include <AzCore/Serialization/Utils.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Math/SimdMath.h>
+#include <AzCore/Math/ToString.h>
 #include <AzFramework/Physics/ShapeConfiguration.h>
 #include <AzFramework/Physics/SystemBus.h>
 #include <AzFramework/Physics/Collision/CollisionGroups.h>
@@ -38,6 +38,7 @@
 #include <Source/Utils.h>
 #include <PhysX/PhysXLocks.h>
 #include <PhysX/Joint/Configuration/PhysXJointConfiguration.h>
+#include <PhysX/MathConversion.h>
 
 namespace PhysX
 {
diff --git a/Gems/PhysX/Code/Source/WindProvider.cpp b/Gems/PhysX/Code/Source/WindProvider.cpp
index 4187ec9d1e..eca9853b7e 100644
--- a/Gems/PhysX/Code/Source/WindProvider.cpp
+++ b/Gems/PhysX/Code/Source/WindProvider.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <WindProvider.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/std/containers/vector.h>
diff --git a/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersBenchmarks.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersBenchmarks.cpp
index 1e0157f079..871cb55d59 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersBenchmarks.cpp
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersBenchmarks.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #ifdef HAVE_BENCHMARK
 #include <benchmark/benchmark.h>
 
diff --git a/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersRagdollBenchmarks.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersRagdollBenchmarks.cpp
index 920de2713f..82c8b2e6f0 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersRagdollBenchmarks.cpp
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersRagdollBenchmarks.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #ifdef HAVE_BENCHMARK
 #include <benchmark/benchmark.h>
 
diff --git a/Gems/PhysX/Code/Tests/Benchmarks/PhysXJointBenchmarks.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXJointBenchmarks.cpp
index b1f3625a75..b929c0b8d4 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXJointBenchmarks.cpp
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXJointBenchmarks.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #ifdef HAVE_BENCHMARK
 #include <benchmark/benchmark.h>
 
diff --git a/Gems/PhysX/Code/Tests/Benchmarks/PhysXRigidBodyBenchmarks.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXRigidBodyBenchmarks.cpp
index 03c881787c..1fc899b870 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXRigidBodyBenchmarks.cpp
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXRigidBodyBenchmarks.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #ifdef HAVE_BENCHMARK
 #include <benchmark/benchmark.h>
 
diff --git a/Gems/PhysX/Code/Tests/Benchmarks/PhysXSceneQueryBenchmarks.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXSceneQueryBenchmarks.cpp
index d67708d770..2cf8496da0 100644
--- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXSceneQueryBenchmarks.cpp
+++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXSceneQueryBenchmarks.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #ifdef HAVE_BENCHMARK
 #include <vector>
 
diff --git a/Gems/PhysX/Code/Tests/CharacterControllerTests.cpp b/Gems/PhysX/Code/Tests/CharacterControllerTests.cpp
index b7c1f639a3..d80860c5b1 100644
--- a/Gems/PhysX/Code/Tests/CharacterControllerTests.cpp
+++ b/Gems/PhysX/Code/Tests/CharacterControllerTests.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzFramework/Physics/PhysicsScene.h>
 
 #include <PhysXCharacters/API/CharacterController.h>
diff --git a/Gems/PhysX/Code/Tests/EditorCharacterControllerTests.cpp b/Gems/PhysX/Code/Tests/EditorCharacterControllerTests.cpp
index a9cce846d4..5453c5e155 100644
--- a/Gems/PhysX/Code/Tests/EditorCharacterControllerTests.cpp
+++ b/Gems/PhysX/Code/Tests/EditorCharacterControllerTests.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "PhysX_precompiled.h"
 #include <Tests/EditorTestUtilities.h>
 #include <EditorRigidBodyComponent.h>
 #include <PhysXCharacters/Components/EditorCharacterControllerComponent.h>
diff --git a/Gems/PhysX/Code/Tests/EditorTestUtilities.cpp b/Gems/PhysX/Code/Tests/EditorTestUtilities.cpp
index f789ae15d2..5ef897cd3e 100644
--- a/Gems/PhysX/Code/Tests/EditorTestUtilities.cpp
+++ b/Gems/PhysX/Code/Tests/EditorTestUtilities.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "PhysX_precompiled.h"
-
 #include <Tests/EditorTestUtilities.h>
 
 #include <EditorShapeColliderComponent.h>
diff --git a/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp b/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp
index 8564905394..a115ca410c 100644
--- a/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXColliderComponentModeTests.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include "TestColliderComponent.h"
 
 #include <AZTestShared/Math/MathTestHelpers.h>
diff --git a/Gems/PhysX/Code/Tests/PhysXCollisionFilteringTest.cpp b/Gems/PhysX/Code/Tests/PhysXCollisionFilteringTest.cpp
index d871770e6e..8e1d3f789a 100644
--- a/Gems/PhysX/Code/Tests/PhysXCollisionFilteringTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXCollisionFilteringTest.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include "PhysXTestFixtures.h"
 #include "PhysXTestUtil.h"
 #include "PhysXTestCommon.h"
diff --git a/Gems/PhysX/Code/Tests/PhysXEditorTest.cpp b/Gems/PhysX/Code/Tests/PhysXEditorTest.cpp
index c798c8121e..300c4e4b46 100644
--- a/Gems/PhysX/Code/Tests/PhysXEditorTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXEditorTest.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "PhysX_precompiled.h"
-
 #include <AzCore/UserSettings/UserSettingsComponent.h>
 #include <AzFramework/IO/LocalFileIO.h>
 #include <AzTest/GemTestEnvironment.h>
diff --git a/Gems/PhysX/Code/Tests/PhysXForceRegionTest.cpp b/Gems/PhysX/Code/Tests/PhysXForceRegionTest.cpp
index 91ce359a54..e08b481000 100644
--- a/Gems/PhysX/Code/Tests/PhysXForceRegionTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXForceRegionTest.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzTest/AzTest.h>
 
 #include <BoxColliderComponent.h>
diff --git a/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp b/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp
index 6a87639585..029e187f3d 100644
--- a/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXJointsTest.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzTest/AzTest.h>
 
 #include <Tests/PhysXGenericTestFixture.h>
diff --git a/Gems/PhysX/Code/Tests/PhysXMultithreadingTest.cpp b/Gems/PhysX/Code/Tests/PhysXMultithreadingTest.cpp
index fd97bdb3ee..96f36068e7 100644
--- a/Gems/PhysX/Code/Tests/PhysXMultithreadingTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXMultithreadingTest.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzTest/AzTest.h>
 #include <AzCore/Math/Random.h>
 #include <AzCore/std/parallel/thread.h>
diff --git a/Gems/PhysX/Code/Tests/PhysXSceneQueryTests.cpp b/Gems/PhysX/Code/Tests/PhysXSceneQueryTests.cpp
index 1ae9d280e4..71b38c76b4 100644
--- a/Gems/PhysX/Code/Tests/PhysXSceneQueryTests.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXSceneQueryTests.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Component/TransformBus.h>
 
diff --git a/Gems/PhysX/Code/Tests/PhysXSceneTests.cpp b/Gems/PhysX/Code/Tests/PhysXSceneTests.cpp
index 94c2d439c9..5c28141dd2 100644
--- a/Gems/PhysX/Code/Tests/PhysXSceneTests.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXSceneTests.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzTest/AzTest.h>
 #include <Tests/PhysXTestCommon.h>
 
diff --git a/Gems/PhysX/Code/Tests/PhysXScriptTest.cpp b/Gems/PhysX/Code/Tests/PhysXScriptTest.cpp
index d2d5b664d2..dfdd489fc7 100644
--- a/Gems/PhysX/Code/Tests/PhysXScriptTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXScriptTest.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include "PhysXTestFixtures.h"
 #include "PhysXTestUtil.h"
 #include "PhysXTestCommon.h"
diff --git a/Gems/PhysX/Code/Tests/PhysXSpecificTest.cpp b/Gems/PhysX/Code/Tests/PhysXSpecificTest.cpp
index 5accc86499..ec1558911e 100644
--- a/Gems/PhysX/Code/Tests/PhysXSpecificTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXSpecificTest.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include "PhysXTestFixtures.h"
 #include "PhysXTestUtil.h"
 
diff --git a/Gems/PhysX/Code/Tests/PhysXSystemTests.cpp b/Gems/PhysX/Code/Tests/PhysXSystemTests.cpp
index dc5edd4a5a..3bcd4fae35 100644
--- a/Gems/PhysX/Code/Tests/PhysXSystemTests.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXSystemTests.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzTest/AzTest.h>
 #include <Tests/PhysXTestCommon.h>
 
diff --git a/Gems/PhysX/Code/Tests/PhysXTestCommon.cpp b/Gems/PhysX/Code/Tests/PhysXTestCommon.cpp
index e39fd321a2..3a955bae9b 100644
--- a/Gems/PhysX/Code/Tests/PhysXTestCommon.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXTestCommon.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <Tests/PhysXTestCommon.h>
 
 #include <AzFramework/Physics/SimulatedBodies/RigidBody.h>
diff --git a/Gems/PhysX/Code/Tests/PhysXTestEnvironment.cpp b/Gems/PhysX/Code/Tests/PhysXTestEnvironment.cpp
index 35096f9b9c..cea59d5cc9 100644
--- a/Gems/PhysX/Code/Tests/PhysXTestEnvironment.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXTestEnvironment.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <PhysXTestEnvironment.h>
 #include <PhysX_Traits_Platform.h>
 #include <AzCore/Asset/AssetManagerComponent.h>
diff --git a/Gems/PhysX/Code/Tests/PhysXTestFixtures.cpp b/Gems/PhysX/Code/Tests/PhysXTestFixtures.cpp
index 1949e27f1d..7f2ef3dfa9 100644
--- a/Gems/PhysX/Code/Tests/PhysXTestFixtures.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXTestFixtures.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
 #include <Tests/PhysXTestFixtures.h>
 #include <Tests/PhysXTestUtil.h>
 #include <Tests/PhysXTestCommon.h>
diff --git a/Gems/PhysX/Code/Tests/PhysXTestUtil.cpp b/Gems/PhysX/Code/Tests/PhysXTestUtil.cpp
index 1af923a753..2708db7c67 100644
--- a/Gems/PhysX/Code/Tests/PhysXTestUtil.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXTestUtil.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include "PhysXTestUtil.h"
 #include <AzFramework/Physics/PhysicsSystem.h>
 #include <AzFramework/Physics/Collision/CollisionEvents.h>
diff --git a/Gems/PhysX/Code/Tests/PhysXWindTest.cpp b/Gems/PhysX/Code/Tests/PhysXWindTest.cpp
index 47599a1129..6cdda6c6ae 100644
--- a/Gems/PhysX/Code/Tests/PhysXWindTest.cpp
+++ b/Gems/PhysX/Code/Tests/PhysXWindTest.cpp
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include <PhysX_precompiled.h>
-
 #include <AzCore/Component/TickBus.h>
 #include <AzCore/Interface/Interface.h>
 #include <AzCore/UnitTest/Helpers.h>
diff --git a/Gems/PhysX/Code/Tests/PolygonPrismMeshUtilsTest.cpp b/Gems/PhysX/Code/Tests/PolygonPrismMeshUtilsTest.cpp
index a24de1d1c2..f9400129b1 100644
--- a/Gems/PhysX/Code/Tests/PolygonPrismMeshUtilsTest.cpp
+++ b/Gems/PhysX/Code/Tests/PolygonPrismMeshUtilsTest.cpp
@@ -5,12 +5,11 @@
  *
  */
 
-#include "PhysX_precompiled.h"
-
 #include <AzCore/UnitTest/TestTypes.h>
 #include <Editor/PolygonPrismMeshUtils.h>
 #include <poly2tri.h>
 #include <AzCore/Math/Geometry2DUtils.h>
+#include <AzCore/Math/Vector3.h>
 
 namespace PolygonPrismMeshUtils
 {
diff --git a/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTestData.cpp b/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTestData.cpp
index 0bfd979a99..33c065f86b 100644
--- a/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTestData.cpp
+++ b/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTestData.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <AzCore/std/containers/array.h>
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Math/Transform.h>
diff --git a/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTests.cpp b/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTests.cpp
index 0d0fe52c0e..2104857b80 100644
--- a/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTests.cpp
+++ b/Gems/PhysX/Code/Tests/PrimitiveShapeFitterTests.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include <MathConversion.h>
 
 #include <AzTest/AzTest.h>
diff --git a/Gems/PhysX/Code/Tests/RagdollTests.cpp b/Gems/PhysX/Code/Tests/RagdollTests.cpp
index 0aa0c85b20..281f5ddbbc 100644
--- a/Gems/PhysX/Code/Tests/RagdollTests.cpp
+++ b/Gems/PhysX/Code/Tests/RagdollTests.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include "RagdollTestData.h"
 #include <AzTest/Utils.h>
 #include <AZTestShared/Utils/Utils.h>
diff --git a/Gems/PhysX/Code/Tests/RigidBodyComponentTests.cpp b/Gems/PhysX/Code/Tests/RigidBodyComponentTests.cpp
index 941591ea32..923e8aeceb 100644
--- a/Gems/PhysX/Code/Tests/RigidBodyComponentTests.cpp
+++ b/Gems/PhysX/Code/Tests/RigidBodyComponentTests.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "PhysX_precompiled.h"
-
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
 #include <EditorColliderComponent.h>
diff --git a/Gems/PhysX/Code/Tests/ShapeColliderComponentTests.cpp b/Gems/PhysX/Code/Tests/ShapeColliderComponentTests.cpp
index 2c51071fac..61549db36a 100644
--- a/Gems/PhysX/Code/Tests/ShapeColliderComponentTests.cpp
+++ b/Gems/PhysX/Code/Tests/ShapeColliderComponentTests.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "PhysX_precompiled.h"
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
 #include <AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.h>
diff --git a/Gems/PhysX/Code/Tests/ShapeGeometryTests.cpp b/Gems/PhysX/Code/Tests/ShapeGeometryTests.cpp
index 833f5425bc..746a58e1e9 100644
--- a/Gems/PhysX/Code/Tests/ShapeGeometryTests.cpp
+++ b/Gems/PhysX/Code/Tests/ShapeGeometryTests.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysX_precompiled.h>
-
 #include "PhysXTestFixtures.h"
 #include "EditorTestUtilities.h"
 #include "PhysXTestCommon.h"
diff --git a/Gems/PhysX/Code/Tests/StaticRigidBodyComponentTests.cpp b/Gems/PhysX/Code/Tests/StaticRigidBodyComponentTests.cpp
index 1d5e9b82d4..6fb663ca0f 100644
--- a/Gems/PhysX/Code/Tests/StaticRigidBodyComponentTests.cpp
+++ b/Gems/PhysX/Code/Tests/StaticRigidBodyComponentTests.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "PhysX_precompiled.h"
-
 #include <AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h>
 #include <LmbrCentral/Shape/BoxShapeComponentBus.h>
 #include <PhysX/PhysXLocks.h>
diff --git a/Gems/PhysX/Code/Tests/SystemComponentTest.cpp b/Gems/PhysX/Code/Tests/SystemComponentTest.cpp
index 48c11eba56..a7da142c5d 100644
--- a/Gems/PhysX/Code/Tests/SystemComponentTest.cpp
+++ b/Gems/PhysX/Code/Tests/SystemComponentTest.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "PhysX_precompiled.h"
-
 #include <Tests/EditorTestUtilities.h>
 
 namespace PhysXEditorTests
diff --git a/Gems/PhysX/Code/physx_files.cmake b/Gems/PhysX/Code/physx_files.cmake
index 97d36e3a03..d4e42252f7 100644
--- a/Gems/PhysX/Code/physx_files.cmake
+++ b/Gems/PhysX/Code/physx_files.cmake
@@ -6,7 +6,6 @@
 #
 
 set(FILES
-    Source/PhysX_precompiled.h
     Source/SystemComponent.cpp
     Source/SystemComponent.h
     Include/PhysX/SystemComponentBus.h
diff --git a/Gems/PhysX/Code/physx_unsupported_files.cmake b/Gems/PhysX/Code/physx_unsupported_files.cmake
deleted file mode 100644
index f818bcf062..0000000000
--- a/Gems/PhysX/Code/physx_unsupported_files.cmake
+++ /dev/null
@@ -1,11 +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
-#
-#
-
-set(FILES
-    Source/PhysXUnsupported_precompiled.cpp
-    Source/PhysXUnsupported_precompiled.h
-)
diff --git a/Gems/PhysXDebug/Code/Source/EditorSystemComponent.cpp b/Gems/PhysXDebug/Code/Source/EditorSystemComponent.cpp
index 6ae0bea82d..6b37b763c8 100644
--- a/Gems/PhysXDebug/Code/Source/EditorSystemComponent.cpp
+++ b/Gems/PhysXDebug/Code/Source/EditorSystemComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "PhysXDebug_precompiled.h"
-
 #include "EditorSystemComponent.h"
 #include <AzCore/Interface/Interface.h>
 #include <AzFramework/Physics/PhysicsSystem.h>
diff --git a/Gems/PhysXDebug/Code/Source/Module.cpp b/Gems/PhysXDebug/Code/Source/Module.cpp
index 49877ab329..5f556af48b 100644
--- a/Gems/PhysXDebug/Code/Source/Module.cpp
+++ b/Gems/PhysXDebug/Code/Source/Module.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "PhysXDebug_precompiled.h"
 #include <AzCore/Memory/SystemAllocator.h>
 #include "SystemComponent.h"
 
diff --git a/Gems/PhysXDebug/Code/Source/ModuleUnsupported.cpp b/Gems/PhysXDebug/Code/Source/ModuleUnsupported.cpp
index 561d062845..7c2a787a03 100644
--- a/Gems/PhysXDebug/Code/Source/ModuleUnsupported.cpp
+++ b/Gems/PhysXDebug/Code/Source/ModuleUnsupported.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include <PhysXDebugUnsupported_precompiled.h>
-
 #include <AzCore/Module/Module.h>
 
 // DO NOT MODIFY THIS LINE UNLESS YOU RENAME THE GEM
diff --git a/Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h b/Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
deleted file mode 100644
index cc8a920d01..0000000000
--- a/Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
+++ /dev/null
@@ -1,8 +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
diff --git a/Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h b/Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
deleted file mode 100644
index ef72b98bc5..0000000000
--- a/Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
+++ /dev/null
@@ -1,10 +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 <PxPhysicsAPI.h>
diff --git a/Gems/PhysXDebug/Code/Source/SystemComponent.cpp b/Gems/PhysXDebug/Code/Source/SystemComponent.cpp
index 1bd9394c02..a28e680ba6 100644
--- a/Gems/PhysXDebug/Code/Source/SystemComponent.cpp
+++ b/Gems/PhysXDebug/Code/Source/SystemComponent.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "PhysXDebug_precompiled.h"
+
 #include "SystemComponent.h"
 
 #include <AzCore/Serialization/SerializeContext.h>
@@ -17,6 +17,7 @@
 #include <PhysX/UserDataTypes.h>
 #include <PhysX/Utils.h>
 #include <PhysX/PhysXLocks.h>
+#include <PhysX/Debug/PhysXDebugConfiguration.h>
 
 #include <AzFramework/Physics/PhysicsScene.h>
 #include <AzFramework/Physics/PhysicsSystem.h>
diff --git a/Gems/PhysXDebug/Code/Source/SystemComponent.h b/Gems/PhysXDebug/Code/Source/SystemComponent.h
index d413fb126d..17661cfe41 100644
--- a/Gems/PhysXDebug/Code/Source/SystemComponent.h
+++ b/Gems/PhysXDebug/Code/Source/SystemComponent.h
@@ -13,6 +13,7 @@
 #include <AzFramework/Entity/EntityDebugDisplayBus.h>
 #include <AzFramework/Physics/Common/PhysicsEvents.h>
 #include <PhysXDebug/PhysXDebugBus.h>
+#include <PxPhysicsAPI.h>
 
 #include <Cry_Camera.h>
 #include <IRenderAuxGeom.h>
diff --git a/Gems/PhysXDebug/Code/physxdebug_editor_files.cmake b/Gems/PhysXDebug/Code/physxdebug_editor_files.cmake
index b228cdc02b..1b3c6ab8c9 100644
--- a/Gems/PhysXDebug/Code/physxdebug_editor_files.cmake
+++ b/Gems/PhysXDebug/Code/physxdebug_editor_files.cmake
@@ -6,7 +6,6 @@
 #
 
 set(FILES
-    Source/PhysXDebug_precompiled.h
     Source/EditorSystemComponent.cpp
     Source/EditorSystemComponent.h
     Source/Module.cpp
diff --git a/Gems/PhysXDebug/Code/physxdebug_files.cmake b/Gems/PhysXDebug/Code/physxdebug_files.cmake
index 9d1d6a7892..757562810e 100644
--- a/Gems/PhysXDebug/Code/physxdebug_files.cmake
+++ b/Gems/PhysXDebug/Code/physxdebug_files.cmake
@@ -6,7 +6,6 @@
 #
 
 set(FILES
-    Source/PhysXDebug_precompiled.h
     Include/PhysXDebug/PhysXDebugBus.h
     Source/Module.cpp
     Source/SystemComponent.h
diff --git a/Gems/PhysXDebug/Code/physxdebug_unsupported_files.cmake b/Gems/PhysXDebug/Code/physxdebug_unsupported_files.cmake
index f12a747f58..30622457d1 100644
--- a/Gems/PhysXDebug/Code/physxdebug_unsupported_files.cmake
+++ b/Gems/PhysXDebug/Code/physxdebug_unsupported_files.cmake
@@ -7,5 +7,4 @@
 
 set(FILES
     Source/ModuleUnsupported.cpp
-    Source/PhysXDebugUnsupported_precompiled.h
 )