diff --git a/Gems/SurfaceData/Code/Include/SurfaceData/Tests/SurfaceDataTestMocks.h b/Gems/SurfaceData/Code/Include/SurfaceData/Tests/SurfaceDataTestMocks.h
index 8fc22fd988..ebf89be0b1 100644
--- a/Gems/SurfaceData/Code/Include/SurfaceData/Tests/SurfaceDataTestMocks.h
+++ b/Gems/SurfaceData/Code/Include/SurfaceData/Tests/SurfaceDataTestMocks.h
@@ -271,7 +271,7 @@ namespace UnitTest
         {
             // We don't actually remove the entry from our list because we use handles as indices, so the indices can't change.
             // Clearing out the entity Id should be good enough.
-            uint32 index = static_cast<uint32>(handle) - 1;
+            uint32_t index = static_cast<uint32_t>(handle) - 1;
             if (index < entryList.size())
             {
                 entryList[index].m_entityId = AZ::EntityId();
@@ -281,7 +281,7 @@ namespace UnitTest
         void UpdateEntry(const SurfaceData::SurfaceDataRegistryHandle& handle, const SurfaceData::SurfaceDataRegistryEntry& entry,
                          AZStd::vector<SurfaceData::SurfaceDataRegistryEntry>& entryList)
         {
-            uint32 index = static_cast<uint32>(handle) - 1;
+            uint32_t index = static_cast<uint32_t>(handle) - 1;
             if (index < entryList.size())
             {
                 entryList[index] = entry;
diff --git a/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.cpp b/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.cpp
index 098e71f9ac..0fa84cae6e 100644
--- a/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.cpp
+++ b/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "SurfaceData_precompiled.h"
 #include "SurfaceDataColliderComponent.h"
 
 #include <AzCore/Debug/Profiler.h>
diff --git a/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.cpp b/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.cpp
index ea33b8d1a2..bab05044bb 100644
--- a/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.cpp
+++ b/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "SurfaceData_precompiled.h"
 #include "SurfaceDataShapeComponent.h"
 
 #include <AzCore/Component/TransformBus.h>
diff --git a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.cpp b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.cpp
index 45532486af..e1986f008c 100644
--- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.cpp
+++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "SurfaceData_precompiled.h"
 #include "EditorSurfaceDataColliderComponent.h"
 #include <AzCore/Serialization/Utils.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
diff --git a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.cpp b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.cpp
index 4422f22e62..ce74705453 100644
--- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.cpp
+++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "SurfaceData_precompiled.h"
 #include "EditorSurfaceDataShapeComponent.h"
 #include <AzCore/Serialization/Utils.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
diff --git a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.cpp b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.cpp
index ab1b0cdffe..9da2540126 100644
--- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.cpp
+++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "SurfaceData_precompiled.h"
 #include "EditorSurfaceDataSystemComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.cpp b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.cpp
index bd127990d4..f6b1ad7a3c 100644
--- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.cpp
+++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "SurfaceData_precompiled.h"
 #include "EditorSurfaceTagListAsset.h"
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
diff --git a/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.cpp b/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.cpp
index fc3b91be5a..039989bbc4 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.cpp
+++ b/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "SurfaceData_precompiled.h"
 #include <SurfaceDataEditorModule.h>
 #include <SurfaceDataSystemComponent.h>
 #include <Editor/EditorSurfaceDataSystemComponent.h>
diff --git a/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.h b/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.h
index 4d5d1fb05f..8bf9cc2ee3 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.h
+++ b/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.h
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "SurfaceData_precompiled.h"
 #include <SurfaceDataModule.h>
 
 namespace SurfaceData
diff --git a/Gems/SurfaceData/Code/Source/SurfaceDataModule.cpp b/Gems/SurfaceData/Code/Source/SurfaceDataModule.cpp
index ae2b66a8f6..3c9b5734f2 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceDataModule.cpp
+++ b/Gems/SurfaceData/Code/Source/SurfaceDataModule.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "SurfaceData_precompiled.h"
-
 #include <SurfaceDataModule.h>
 #include <SurfaceDataSystemComponent.h>
 #include <Components/SurfaceDataColliderComponent.h>
diff --git a/Gems/SurfaceData/Code/Source/SurfaceDataModule.h b/Gems/SurfaceData/Code/Source/SurfaceDataModule.h
index afd5ad1b52..d3f1e4632a 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceDataModule.h
+++ b/Gems/SurfaceData/Code/Source/SurfaceDataModule.h
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "SurfaceData_precompiled.h"
 #include <AzCore/Module/Module.h>
 
 namespace SurfaceData
diff --git a/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.cpp b/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.cpp
index a3e6d65eef..9c5d47d44b 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.cpp
+++ b/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.cpp
@@ -5,8 +5,6 @@
  *
  */
 
-#include "SurfaceData_precompiled.h"
-
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/SurfaceData/Code/Source/SurfaceDataUtility.cpp b/Gems/SurfaceData/Code/Source/SurfaceDataUtility.cpp
index 24e59bd2c2..8f3b0c3b8b 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceDataUtility.cpp
+++ b/Gems/SurfaceData/Code/Source/SurfaceDataUtility.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "SurfaceData_precompiled.h"
+
 #include <SurfaceData/Utility/SurfaceDataUtility.h>
 #include <Atom/RPI.Reflect/Model/ModelAssetCreator.h>
 
diff --git a/Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h b/Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
deleted file mode 100644
index d424689241..0000000000
--- a/Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
+++ /dev/null
@@ -1,9 +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.
diff --git a/Gems/SurfaceData/Code/Source/SurfaceTag.cpp b/Gems/SurfaceData/Code/Source/SurfaceTag.cpp
index 692e7185bb..b54ca4a4a9 100644
--- a/Gems/SurfaceData/Code/Source/SurfaceTag.cpp
+++ b/Gems/SurfaceData/Code/Source/SurfaceTag.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include "SurfaceData_precompiled.h"
 #include <SurfaceData/SurfaceTag.h>
 
 #include <AzCore/RTTI/BehaviorContext.h>
diff --git a/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.cpp b/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.cpp
index 01b9467363..e5eb4a5f6a 100644
--- a/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.cpp
+++ b/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "SurfaceData_precompiled.h"
+
 #include "TerrainSurfaceDataSystemComponent.h"
 #include <AzCore/Debug/Profiler.h> 
 #include <AzCore/Math/MathUtils.h>
diff --git a/Gems/SurfaceData/Code/Tests/SurfaceDataColliderComponentTest.cpp b/Gems/SurfaceData/Code/Tests/SurfaceDataColliderComponentTest.cpp
index ecb3c9cfa6..154d329a05 100644
--- a/Gems/SurfaceData/Code/Tests/SurfaceDataColliderComponentTest.cpp
+++ b/Gems/SurfaceData/Code/Tests/SurfaceDataColliderComponentTest.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "SurfaceData_precompiled.h"
+
 #include <SurfaceData/Tests/SurfaceDataTestMocks.h>
 
 #include <AzTest/AzTest.h>
diff --git a/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp b/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp
index cffdf0ea3f..d6b335bd6e 100644
--- a/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp
+++ b/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-#include "SurfaceData_precompiled.h"
 
 #include <AzTest/AzTest.h>
 #include <Mocks/ITimerMock.h>
diff --git a/Gems/SurfaceData/Code/surfacedata_files.cmake b/Gems/SurfaceData/Code/surfacedata_files.cmake
index cfeec51b41..0560c3f81a 100644
--- a/Gems/SurfaceData/Code/surfacedata_files.cmake
+++ b/Gems/SurfaceData/Code/surfacedata_files.cmake
@@ -6,7 +6,6 @@
 #
 
 set(FILES
-    Source/SurfaceData_precompiled.h
     Include/SurfaceData/SurfaceDataConstants.h
     Include/SurfaceData/SurfaceDataTypes.h
     Include/SurfaceData/SurfaceDataSystemRequestBus.h