diff --git a/Gems/Vegetation/Code/CMakeLists.txt b/Gems/Vegetation/Code/CMakeLists.txt
index 10d54da78e..2b32368d5a 100644
--- a/Gems/Vegetation/Code/CMakeLists.txt
+++ b/Gems/Vegetation/Code/CMakeLists.txt
@@ -28,7 +28,6 @@ ly_add_target(
             Gem::LmbrCentral
             Gem::SurfaceData
         PUBLIC
-            Legacy::CryCommon
             Gem::AtomLyIntegration_CommonFeatures.Static
     RUNTIME_DEPENDENCIES
         Gem::GradientSignal
diff --git a/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp b/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp
index e54f523b43..d6e4be6e9b 100644
--- a/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp
+++ b/Gems/Vegetation/Code/Source/AreaSystemComponent.cpp
@@ -10,7 +10,7 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
+#include <VegetationProfiler.h>
 #include "AreaSystemComponent.h"
 
 #include <Vegetation/Ebuses/AreaNotificationBus.h>
diff --git a/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.cpp b/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.cpp
index ff39f6321e..7c9d8013d0 100644
--- a/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/AreaBlenderComponent.cpp
@@ -10,7 +10,7 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
+#include <VegetationProfiler.h>
 #include "AreaBlenderComponent.h"
 #include <AzCore/Debug/Profiler.h>
 #include <AzCore/RTTI/BehaviorContext.h>
diff --git a/Gems/Vegetation/Code/Source/Components/AreaComponentBase.cpp b/Gems/Vegetation/Code/Source/Components/AreaComponentBase.cpp
index 056006f64a..46e214534a 100644
--- a/Gems/Vegetation/Code/Source/Components/AreaComponentBase.cpp
+++ b/Gems/Vegetation/Code/Source/Components/AreaComponentBase.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include <Vegetation/AreaComponentBase.h>
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Components/BlockerComponent.cpp b/Gems/Vegetation/Code/Source/Components/BlockerComponent.cpp
index fa876c5cf0..5219334fd6 100644
--- a/Gems/Vegetation/Code/Source/Components/BlockerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/BlockerComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "BlockerComponent.h"
 
 #include <AzCore/Component/Entity.h>
diff --git a/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.cpp b/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.cpp
index ffa57a0326..3a903399d1 100644
--- a/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/DescriptorListCombinerComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "DescriptorListCombinerComponent.h"
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.cpp b/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.cpp
index c6939d520a..bc5be7423b 100644
--- a/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/DescriptorListComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "DescriptorListComponent.h"
 #include <AzCore/Asset/AssetManagerBus.h>
 #include <AzCore/Component/Entity.h>
diff --git a/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.cpp b/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.cpp
index 840eec8dfa..19cf75e4d2 100644
--- a/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/DescriptorWeightSelectorComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "DescriptorWeightSelectorComponent.h"
 #include <AzCore/Component/Entity.h>
 #include <AzCore/RTTI/BehaviorContext.h>
diff --git a/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.cpp
index 16b1bb5f7e..99050638b5 100644
--- a/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/DistanceBetweenFilterComponent.cpp
@@ -10,7 +10,7 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
+#include <VegetationProfiler.h>
 #include "DistanceBetweenFilterComponent.h"
 #include <AzCore/Component/Entity.h>
 #include <AzCore/RTTI/BehaviorContext.h>
diff --git a/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.cpp
index 2ba07f95b3..aff560d7d4 100644
--- a/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/DistributionFilterComponent.cpp
@@ -10,7 +10,7 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
+#include <VegetationProfiler.h>
 #include "DistributionFilterComponent.h"
 #include <AzCore/Component/Entity.h>
 #include <AzCore/RTTI/BehaviorContext.h>
diff --git a/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.cpp b/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.cpp
index 748ba0506a..4196619ffc 100644
--- a/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/LevelSettingsComponent.cpp
@@ -9,7 +9,6 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
-#include "Vegetation_precompiled.h"
 #include "LevelSettingsComponent.h"
 
 #include <AzCore/RTTI/BehaviorContext.h>
diff --git a/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.cpp b/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.cpp
index d37dc4a82d..8eedf4019b 100644
--- a/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/MeshBlockerComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "MeshBlockerComponent.h"
 
 #include <AzCore/Debug/Profiler.h>
diff --git a/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.cpp b/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.cpp
index 5781e53b41..5c1c48aa39 100644
--- a/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/PositionModifierComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "PositionModifierComponent.h"
 #include <AzCore/Component/Entity.h>
 #include <AzCore/RTTI/BehaviorContext.h>
diff --git a/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.cpp b/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.cpp
index c5f99239d3..fc62eb39a7 100644
--- a/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/ReferenceShapeComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "ReferenceShapeComponent.h"
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.cpp b/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.cpp
index 9dda59463e..d88b606aa3 100644
--- a/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/RotationModifierComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "RotationModifierComponent.h"
 #include <AzCore/Component/Entity.h>
 #include <AzCore/RTTI/BehaviorContext.h>
diff --git a/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.cpp b/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.cpp
index 63755e5325..6e0397b410 100644
--- a/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/ScaleModifierComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "ScaleModifierComponent.h"
 #include <AzCore/Component/Entity.h>
 #include <AzCore/RTTI/BehaviorContext.h>
diff --git a/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.cpp
index b1512f89a4..b7f9f7fe9c 100644
--- a/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/ShapeIntersectionFilterComponent.cpp
@@ -10,7 +10,7 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
+#include <VegetationProfiler.h>
 #include "ShapeIntersectionFilterComponent.h"
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Debug/Profiler.h>
diff --git a/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.cpp b/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.cpp
index 3ff45bad74..78d4d4729c 100644
--- a/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/SlopeAlignmentModifierComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "SlopeAlignmentModifierComponent.h"
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Math/Matrix3x3.h>
diff --git a/Gems/Vegetation/Code/Source/Components/SpawnerComponent.cpp b/Gems/Vegetation/Code/Source/Components/SpawnerComponent.cpp
index 6c1db9037b..321613dd08 100644
--- a/Gems/Vegetation/Code/Source/Components/SpawnerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/SpawnerComponent.cpp
@@ -10,7 +10,7 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
+#include <VegetationProfiler.h>
 #include "SpawnerComponent.h"
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Debug/Profiler.h>
diff --git a/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.cpp
index 7e6737ecf7..ebc8896fe6 100644
--- a/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/SurfaceAltitudeFilterComponent.cpp
@@ -10,7 +10,7 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
+#include <VegetationProfiler.h>
 #include "SurfaceAltitudeFilterComponent.h"
 #include <AzCore/Component/Entity.h>
 #include <AzCore/RTTI/BehaviorContext.h>
diff --git a/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.cpp
index d8e8b47f7b..2a191245ee 100644
--- a/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/SurfaceMaskDepthFilterComponent.cpp
@@ -10,7 +10,7 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
+#include <VegetationProfiler.h>
 #include "SurfaceMaskDepthFilterComponent.h"
 
 #include <AzCore/Component/Entity.h>
diff --git a/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.cpp
index d18a7434ae..0749d9473a 100644
--- a/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/SurfaceMaskFilterComponent.cpp
@@ -10,7 +10,7 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
+#include <VegetationProfiler.h>
 #include "SurfaceMaskFilterComponent.h"
 
 #include <AzCore/Component/Entity.h>
diff --git a/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.cpp b/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.cpp
index f856e4bd8f..27938b9c74 100644
--- a/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Components/SurfaceSlopeFilterComponent.cpp
@@ -10,7 +10,7 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
+#include <VegetationProfiler.h>
 #include "SurfaceSlopeFilterComponent.h"
 #include <AzCore/Component/Entity.h>
 #include <AzCore/Math/MathUtils.h>
diff --git a/Gems/Vegetation/Code/Source/DebugSystemComponent.cpp b/Gems/Vegetation/Code/Source/DebugSystemComponent.cpp
index c62905766e..984f8fd538 100644
--- a/Gems/Vegetation/Code/Source/DebugSystemComponent.cpp
+++ b/Gems/Vegetation/Code/Source/DebugSystemComponent.cpp
@@ -9,7 +9,6 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
-#include "Vegetation_precompiled.h"
 #include "DebugSystemComponent.h"
 
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.cpp b/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.cpp
index 12ba003cc0..91ab9279fe 100644
--- a/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include <Debugger/AreaDebugComponent.h>
 #include <AzCore/Component/Entity.h>
 #include <AzCore/RTTI/BehaviorContext.h>
diff --git a/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.h b/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.h
index 014e45249a..7bea99a2fa 100644
--- a/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.h
+++ b/Gems/Vegetation/Code/Source/Debugger/AreaDebugComponent.h
@@ -14,6 +14,7 @@
 
 #include <AzCore/RTTI/RTTI.h>
 #include <AzCore/Asset/AssetCommon.h>
+#include <AzCore/Casting/lossy_cast.h>
 #include <AzCore/Component/Component.h>
 #include <AzCore/Math/Color.h>
 #include <AzCore/Math/Vector3.h>
@@ -31,13 +32,13 @@ namespace Vegetation
 {
     AZ_INLINE AZ::Color GetDebugColor()
     {
-        static uint32 debugColor = 0xff << 8;
+        static uint32_t debugColor = 0xff << 8;
         AZ::Color value;
         value.FromU32(debugColor | (0xff << 24)); // add in alpha 255
         // use a golden ratio sequence to generate the next color
         // new color = fract(old color * 1.6)
         // Treat the 24 bits as normalized 0 - 1
-        debugColor = (uint32)((((uint64)debugColor * 0x1999999ull) - 0xffffffull) & 0xffffffull);
+        debugColor = azlossy_cast<uint32_t>(((aznumeric_cast<uint64_t>(debugColor) * 0x1999999ull) - 0xffffffull) & 0xffffffull);
         return value;
     }
 
diff --git a/Gems/Vegetation/Code/Source/Debugger/DebugComponent.cpp b/Gems/Vegetation/Code/Source/Debugger/DebugComponent.cpp
index 099bd2e90c..cb241c4fd2 100644
--- a/Gems/Vegetation/Code/Source/Debugger/DebugComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Debugger/DebugComponent.cpp
@@ -10,7 +10,7 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
+#include <VegetationProfiler.h>
 #include "DebugComponent.h"
 #include "AreaSystemComponent.h"
 #include "InstanceSystemComponent.h"
diff --git a/Gems/Vegetation/Code/Source/Debugger/DebugComponent.h b/Gems/Vegetation/Code/Source/Debugger/DebugComponent.h
index ae834b3632..9283c1da90 100644
--- a/Gems/Vegetation/Code/Source/Debugger/DebugComponent.h
+++ b/Gems/Vegetation/Code/Source/Debugger/DebugComponent.h
@@ -167,7 +167,7 @@ namespace Vegetation
 
         using AreaData = AZStd::vector<AreaTracker>;
         AZStd::size_t MakeAreaSectorKey(AZ::EntityId areaId, SectorId sectorId);
-        AZStd::unordered_map<uint64, AreaTracker> m_currentAreasTiming;
+        AZStd::unordered_map<uint64_t, AreaTracker> m_currentAreasTiming;
         AreaData m_areaData;
 
         AZStd::vector<SectorTiming> m_currentSortedTimingList;
diff --git a/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.cpp b/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.cpp
index bf942f78c4..2069dd66bb 100644
--- a/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Debugger/EditorAreaDebugComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorAreaDebugComponent.h"
 
 #include <AzCore/Serialization/Utils.h>
diff --git a/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.cpp b/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.cpp
index 533a1daf00..0dc66ee3b8 100644
--- a/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Debugger/EditorDebugComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorDebugComponent.h"
 
 #include <AzCore/Serialization/Utils.h>
diff --git a/Gems/Vegetation/Code/Source/Descriptor.cpp b/Gems/Vegetation/Code/Source/Descriptor.cpp
index d0075f2d7b..cb1a4e45b7 100644
--- a/Gems/Vegetation/Code/Source/Descriptor.cpp
+++ b/Gems/Vegetation/Code/Source/Descriptor.cpp
@@ -10,8 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
-
 #include <Vegetation/Descriptor.h>
 #include <SurfaceData/SurfaceTag.h>
 #include <AzCore/Asset/AssetManager.h>
diff --git a/Gems/Vegetation/Code/Source/DescriptorListAsset.cpp b/Gems/Vegetation/Code/Source/DescriptorListAsset.cpp
index 90728718ed..4e0294c58c 100644
--- a/Gems/Vegetation/Code/Source/DescriptorListAsset.cpp
+++ b/Gems/Vegetation/Code/Source/DescriptorListAsset.cpp
@@ -10,8 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
-
 #include <Vegetation/DescriptorListAsset.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp b/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp
index a185c9a601..9ed23c7dd2 100644
--- a/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp
+++ b/Gems/Vegetation/Code/Source/DynamicSliceInstanceSpawner.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include <Vegetation/DynamicSliceInstanceSpawner.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/Asset/AssetManager.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.cpp
index 7371a96ba1..7511d6b8be 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorAreaBlenderComponent.cpp
@@ -10,14 +10,11 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorAreaBlenderComponent.h"
 #include <AzCore/Serialization/Utils.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h>
 #include <LmbrCentral/Dependency/DependencyNotificationBus.h>
-#include <MathConversion.h>
-#include <IRenderAuxGeom.h>
 #include <GradientSignal/Ebuses/SectorDataRequestBus.h>
 #include <Vegetation/Ebuses/AreaSystemRequestBus.h>
 #include <LmbrCentral/Shape/BoxShapeComponentBus.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.cpp
index bbd116b091..da0a2b5f53 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorBlockerComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorBlockerComponent.h"
 #include <AzCore/Serialization/Utils.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.cpp
index ade8121b06..cbe62e0444 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListCombinerComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorDescriptorListCombinerComponent.h"
 #include <LmbrCentral/Dependency/DependencyNotificationBus.h>
 
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.cpp
index 51ecc03c5a..18c045346b 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorListComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorDescriptorListComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.cpp
index 1c23745831..5ae65d3c21 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDescriptorWeightSelectorComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorDescriptorWeightSelectorComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.cpp
index ea6ab5eec1..e43be749bd 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDistanceBetweenFilterComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorDistanceBetweenFilterComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.cpp
index 8ea0acb78d..6b75ca73bc 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorDistributionFilterComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorDistributionFilterComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.cpp
index 6f6a6f2ec4..5faae032a3 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorLevelSettingsComponent.cpp
@@ -10,8 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
-
 #include "EditorLevelSettingsComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.cpp
index fe519877e2..63c63d3d87 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorMeshBlockerComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorMeshBlockerComponent.h"
 #include <AzCore/Serialization/Utils.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.cpp
index 14ae748168..e12444b83e 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorPositionModifierComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorPositionModifierComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.cpp
index 5f3225e23d..4240e4914c 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorReferenceShapeComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorReferenceShapeComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.cpp
index 8d81ff1dae..ab9d55f221 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorRotationModifierComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorRotationModifierComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.cpp
index d6dc70a523..1c1684f5d5 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorScaleModifierComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorScaleModifierComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.cpp
index 93e5f41c75..b5a236bcee 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorShapeIntersectionFilterComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorShapeIntersectionFilterComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.cpp
index 6002787404..ce036813d0 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSlopeAlignmentModifierComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorSlopeAlignmentModifierComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.cpp
index 9dd393e124..6aad60f051 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSpawnerComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorSpawnerComponent.h"
 #include <AzCore/Serialization/Utils.h>
 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.cpp
index 6e46241b83..3ea5760a46 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceAltitudeFilterComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorSurfaceAltitudeFilterComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.cpp
index f28d134dd0..b4a37f679b 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskDepthFilterComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorSurfaceMaskDepthFilterComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.cpp
index 7567acdbde..7d64bc2423 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceMaskFilterComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorSurfaceMaskFilterComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.cpp
index 5b0868566d..ae93cf3c0b 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorSurfaceSlopeFilterComponent.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include "EditorSurfaceSlopeFilterComponent.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
diff --git a/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.cpp b/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.cpp
index 17174fa132..fc056de636 100644
--- a/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.cpp
+++ b/Gems/Vegetation/Code/Source/Editor/EditorVegetationSystemComponent.cpp
@@ -9,14 +9,10 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
-#include "Vegetation_precompiled.h"
 #include "EditorVegetationSystemComponent.h"
 
 #include <Vegetation/Editor/EditorAreaComponentBase.h>
 #include <Vegetation/Editor/EditorVegetationComponentBase.h>
-
-#include <CrySystemBus.h>
-
 #include <AzToolsFramework/UI/PropertyEditor/GenericComboBoxCtrl.h>
 
 namespace Vegetation
diff --git a/Gems/Vegetation/Code/Source/EmptyInstanceSpawner.cpp b/Gems/Vegetation/Code/Source/EmptyInstanceSpawner.cpp
index 9146ea1090..11ceecefc4 100644
--- a/Gems/Vegetation/Code/Source/EmptyInstanceSpawner.cpp
+++ b/Gems/Vegetation/Code/Source/EmptyInstanceSpawner.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include <Vegetation/EmptyInstanceSpawner.h>
 #include <AzCore/Serialization/EditContext.h>
 #include <AzCore/RTTI/BehaviorContext.h>
diff --git a/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp b/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp
index 4aaf0a0b49..cd50c1f898 100644
--- a/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp
+++ b/Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp
@@ -9,7 +9,7 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
-#include "Vegetation_precompiled.h"
+#include <VegetationProfiler.h>
 #include "InstanceSystemComponent.h"
 
 #include <AzCore/Debug/Profiler.h> 
diff --git a/Gems/Vegetation/Code/Source/PrefabInstanceSpawner.cpp b/Gems/Vegetation/Code/Source/PrefabInstanceSpawner.cpp
index f22dbb61aa..9ff66a875f 100644
--- a/Gems/Vegetation/Code/Source/PrefabInstanceSpawner.cpp
+++ b/Gems/Vegetation/Code/Source/PrefabInstanceSpawner.cpp
@@ -10,7 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
 #include <Vegetation/PrefabInstanceSpawner.h>
 
 #include <AzCore/Asset/AssetManager.h>
diff --git a/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp b/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp
index ce1f129e1a..c044487704 100644
--- a/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp
+++ b/Gems/Vegetation/Code/Source/VegetationEditorModule.cpp
@@ -10,8 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
-
 #include <VegetationEditorModule.h>
 
 #include <Editor/EditorAreaBlenderComponent.h>
diff --git a/Gems/Vegetation/Code/Source/VegetationEditorModule.h b/Gems/Vegetation/Code/Source/VegetationEditorModule.h
index 76e409f0b5..107d400d1e 100644
--- a/Gems/Vegetation/Code/Source/VegetationEditorModule.h
+++ b/Gems/Vegetation/Code/Source/VegetationEditorModule.h
@@ -12,7 +12,6 @@
 
 #pragma once
 
-#include "Vegetation_precompiled.h"
 #include <VegetationModule.h>
 
 namespace Vegetation
diff --git a/Gems/Vegetation/Code/Source/VegetationModule.cpp b/Gems/Vegetation/Code/Source/VegetationModule.cpp
index 90215e7996..7daa33b35c 100644
--- a/Gems/Vegetation/Code/Source/VegetationModule.cpp
+++ b/Gems/Vegetation/Code/Source/VegetationModule.cpp
@@ -10,8 +10,6 @@
 *
 */
 
-#include "Vegetation_precompiled.h"
-
 #include <VegetationModule.h>
 
 #include <Components/AreaBlenderComponent.h>
diff --git a/Gems/Vegetation/Code/Source/VegetationModule.h b/Gems/Vegetation/Code/Source/VegetationModule.h
index 0b36eb3856..26d0a169aa 100644
--- a/Gems/Vegetation/Code/Source/VegetationModule.h
+++ b/Gems/Vegetation/Code/Source/VegetationModule.h
@@ -12,7 +12,6 @@
 
 #pragma once
 
-#include "Vegetation_precompiled.h"
 #include <AzCore/Module/Module.h>
 
 namespace Vegetation
diff --git a/Gems/Vegetation/Code/Source/Vegetation_precompiled.h b/Gems/Vegetation/Code/Source/VegetationProfiler.h
similarity index 90%
rename from Gems/Vegetation/Code/Source/Vegetation_precompiled.h
rename to Gems/Vegetation/Code/Source/VegetationProfiler.h
index 92116dd175..fa8ff7865b 100644
--- a/Gems/Vegetation/Code/Source/Vegetation_precompiled.h
+++ b/Gems/Vegetation/Code/Source/VegetationProfiler.h
@@ -11,8 +11,6 @@
 */
 #pragma once
 
-#include <platform.h> // Many CryCommon files require that this is included first.
-
 // VEG_PROFILE_ENABLED is defined in the wscript
 // VEG_PROFILE_ENABLED is only defined in the Vegetation gem by default
 #if defined(VEG_PROFILE_ENABLED)
diff --git a/Gems/Vegetation/Code/Source/VegetationSystemComponent.cpp b/Gems/Vegetation/Code/Source/VegetationSystemComponent.cpp
index a3a1ff4616..78a6a4171d 100644
--- a/Gems/Vegetation/Code/Source/VegetationSystemComponent.cpp
+++ b/Gems/Vegetation/Code/Source/VegetationSystemComponent.cpp
@@ -9,7 +9,6 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
-#include "Vegetation_precompiled.h"
 #include "VegetationSystemComponent.h"
 
 #include <AzCore/RTTI/BehaviorContext.h>
@@ -27,8 +26,6 @@
 #include <Vegetation/DynamicSliceInstanceSpawner.h>
 #include <Vegetation/PrefabInstanceSpawner.h>
 
-#include <CrySystemBus.h>
-
 namespace Vegetation
 {
     namespace Details
diff --git a/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp b/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp
index c3aa910b47..3ced558c3d 100644
--- a/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp
+++ b/Gems/Vegetation/Code/Tests/DynamicSliceInstanceSpawnerTests.cpp
@@ -9,8 +9,6 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
-#include "Vegetation_precompiled.h"
-
 #include "VegetationTest.h"
 #include "VegetationMocks.h"
 
diff --git a/Gems/Vegetation/Code/Tests/EmptyInstanceSpawnerTests.cpp b/Gems/Vegetation/Code/Tests/EmptyInstanceSpawnerTests.cpp
index 19ebca7602..dae9a692d5 100644
--- a/Gems/Vegetation/Code/Tests/EmptyInstanceSpawnerTests.cpp
+++ b/Gems/Vegetation/Code/Tests/EmptyInstanceSpawnerTests.cpp
@@ -9,8 +9,6 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
-#include "Vegetation_precompiled.h"
-
 #include "VegetationTest.h"
 #include "VegetationMocks.h"
 
diff --git a/Gems/Vegetation/Code/Tests/PrefabInstanceSpawnerTests.cpp b/Gems/Vegetation/Code/Tests/PrefabInstanceSpawnerTests.cpp
index 368615ea42..ed618278d2 100644
--- a/Gems/Vegetation/Code/Tests/PrefabInstanceSpawnerTests.cpp
+++ b/Gems/Vegetation/Code/Tests/PrefabInstanceSpawnerTests.cpp
@@ -9,8 +9,6 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
-#include "Vegetation_precompiled.h"
-
 #include "VegetationTest.h"
 #include "VegetationMocks.h"
 
diff --git a/Gems/Vegetation/Code/Tests/VegetationAreaSystemComponentTest.cpp b/Gems/Vegetation/Code/Tests/VegetationAreaSystemComponentTest.cpp
index 8c72b01fd5..c06db1b9d8 100644
--- a/Gems/Vegetation/Code/Tests/VegetationAreaSystemComponentTest.cpp
+++ b/Gems/Vegetation/Code/Tests/VegetationAreaSystemComponentTest.cpp
@@ -9,8 +9,6 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
-#include "Vegetation_precompiled.h"
-
 #include <AzTest/AzTest.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzCore/Component/ComponentApplication.h>
diff --git a/Gems/Vegetation/Code/Tests/VegetationComponentDescriptorTests.cpp b/Gems/Vegetation/Code/Tests/VegetationComponentDescriptorTests.cpp
index 6e2aa42c9b..a19a4f2516 100644
--- a/Gems/Vegetation/Code/Tests/VegetationComponentDescriptorTests.cpp
+++ b/Gems/Vegetation/Code/Tests/VegetationComponentDescriptorTests.cpp
@@ -9,8 +9,6 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
-#include "Vegetation_precompiled.h"
-
 #include "VegetationTest.h"
 #include "VegetationMocks.h"
 
diff --git a/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp b/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp
index cfd621b397..17e3626e32 100644
--- a/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp
+++ b/Gems/Vegetation/Code/Tests/VegetationComponentFilterTests.cpp
@@ -9,8 +9,6 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
-#include "Vegetation_precompiled.h"
-
 #include "VegetationTest.h"
 #include "VegetationMocks.h"
 
diff --git a/Gems/Vegetation/Code/Tests/VegetationComponentModifierTests.cpp b/Gems/Vegetation/Code/Tests/VegetationComponentModifierTests.cpp
index 035e4efdc8..60a0e73250 100644
--- a/Gems/Vegetation/Code/Tests/VegetationComponentModifierTests.cpp
+++ b/Gems/Vegetation/Code/Tests/VegetationComponentModifierTests.cpp
@@ -9,8 +9,6 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
-#include "Vegetation_precompiled.h"
-
 #include "VegetationTest.h"
 #include "VegetationMocks.h"
 
diff --git a/Gems/Vegetation/Code/Tests/VegetationComponentOperationTests.cpp b/Gems/Vegetation/Code/Tests/VegetationComponentOperationTests.cpp
index c69024826b..b9dce45ccd 100644
--- a/Gems/Vegetation/Code/Tests/VegetationComponentOperationTests.cpp
+++ b/Gems/Vegetation/Code/Tests/VegetationComponentOperationTests.cpp
@@ -9,8 +9,6 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
-#include "Vegetation_precompiled.h"
-
 #include "VegetationTest.h"
 #include "VegetationMocks.h"
 
diff --git a/Gems/Vegetation/Code/Tests/VegetationTest.cpp b/Gems/Vegetation/Code/Tests/VegetationTest.cpp
index d570cd3386..b58b80a3a9 100644
--- a/Gems/Vegetation/Code/Tests/VegetationTest.cpp
+++ b/Gems/Vegetation/Code/Tests/VegetationTest.cpp
@@ -9,8 +9,6 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *
 */
-#include "Vegetation_precompiled.h"
-
 #include <AzTest/AzTest.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include "VegetationTest.h"
diff --git a/Gems/Vegetation/Code/vegetation_files.cmake b/Gems/Vegetation/Code/vegetation_files.cmake
index d06a2d6927..896720d30e 100644
--- a/Gems/Vegetation/Code/vegetation_files.cmake
+++ b/Gems/Vegetation/Code/vegetation_files.cmake
@@ -10,7 +10,6 @@
 #
 
 set(FILES
-    Source/Vegetation_precompiled.h
     Include/Vegetation/DescriptorListAsset.h
     Include/Vegetation/Descriptor.h
     Include/Vegetation/InstanceData.h
diff --git a/Gems/Vegetation/Code/vegetation_shared_files.cmake b/Gems/Vegetation/Code/vegetation_shared_files.cmake
index 82b02b3881..4a49699f79 100644
--- a/Gems/Vegetation/Code/vegetation_shared_files.cmake
+++ b/Gems/Vegetation/Code/vegetation_shared_files.cmake
@@ -14,4 +14,5 @@ set(FILES
     Source/AreaSystemComponent.h
     Source/VegetationModule.cpp
     Source/VegetationModule.h
+    Source/VegetationProfiler.h
 )