diff --git a/Unreal/Plugins/AirSim/Source/AirBlueprintLib.h b/Unreal/Plugins/AirSim/Source/AirBlueprintLib.h
index d41579857..2645f0efa 100644
--- a/Unreal/Plugins/AirSim/Source/AirBlueprintLib.h
+++ b/Unreal/Plugins/AirSim/Source/AirBlueprintLib.h
@@ -8,11 +8,15 @@
 #include "GameFramework/Actor.h"
 #include "Components/InputComponent.h"
 #include "EngineUtils.h"
+#include "Engine/Blueprint.h"
 #include "GameFramework/PlayerInput.h"
 #include "IImageWrapperModule.h"
 #include "Kismet/BlueprintFunctionLibrary.h"
+#include "AssetRegistry/AssetData.h"
 #include "Kismet/KismetMathLibrary.h"
 #include "Components/MeshComponent.h"
+#include "StaticMeshResources.h"
+#include "Rendering/PositionVertexBuffer.h"
 #include "LandscapeProxy.h"
 #include "Kismet/GameplayStatics.h"
 #include "Kismet/KismetStringLibrary.h"
@@ -21,6 +25,8 @@
 #include "Runtime/Engine/Classes/Kismet/GameplayStatics.h"
 #include "Runtime/Core/Public/HAL/FileManager.h"
 #include "common/AirSimSettings.hpp"
+#include "UObject/ObjectMacros.h"
+#include "UObject/ScriptMacros.h"
 #include <string>
 #include <regex>
 #include "AirBlueprintLib.generated.h"
diff --git a/Unreal/Plugins/AirSim/Source/Annotation/AnnotationComponent.h b/Unreal/Plugins/AirSim/Source/Annotation/AnnotationComponent.h
index f4b9a55a1..5977290e2 100644
--- a/Unreal/Plugins/AirSim/Source/Annotation/AnnotationComponent.h
+++ b/Unreal/Plugins/AirSim/Source/Annotation/AnnotationComponent.h
@@ -3,6 +3,9 @@
 // Licensed under the MIT License.
 #pragma once
 
+#include "Materials/MaterialInterface.h"
+#include "Engine/Texture2D.h"
+#include "Materials/MaterialInstanceDynamic.h"
 #include "Runtime/Engine/Classes/Components/StaticMeshComponent.h"
 #include "Runtime/Engine/Public/SkeletalRenderPublic.h"
 
diff --git a/Unreal/Plugins/AirSim/Source/Annotation/ObjectAnnotator.h b/Unreal/Plugins/AirSim/Source/Annotation/ObjectAnnotator.h
index 10866274c..b74527332 100644
--- a/Unreal/Plugins/AirSim/Source/Annotation/ObjectAnnotator.h
+++ b/Unreal/Plugins/AirSim/Source/Annotation/ObjectAnnotator.h
@@ -5,6 +5,13 @@
 
 #include <vector>
 #include <string>
+#include "Components/MeshComponent.h"
+#include "Components/SceneComponent.h"
+#include "UObject/ObjectMacros.h"
+#include "Components/StaticMeshComponent.h"
+#include <Engine/StaticMesh.h>
+#include "ShowFlags.h"
+#include "UObject/ScriptMacros.h"
 #include "Runtime/Engine/Classes/GameFramework/Actor.h"
 
 class FColorGenerator
diff --git a/Unreal/Plugins/AirSim/Source/Beacons/DynamicBlockBeacon.h b/Unreal/Plugins/AirSim/Source/Beacons/DynamicBlockBeacon.h
index 06e52e123..578698d2a 100644
--- a/Unreal/Plugins/AirSim/Source/Beacons/DynamicBlockBeacon.h
+++ b/Unreal/Plugins/AirSim/Source/Beacons/DynamicBlockBeacon.h
@@ -4,6 +4,8 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/Actor.h"
+#include "Components/StaticMeshComponent.h"
+#include <Engine/StaticMesh.h>
 #include "AirLib/include/common/AirSimSettings.hpp"
 
 #include "DynamicBlockBeacon.generated.h"
diff --git a/Unreal/Plugins/AirSim/Source/Beacons/DynamicRackBeacon.h b/Unreal/Plugins/AirSim/Source/Beacons/DynamicRackBeacon.h
index 20574cd37..4b1d9002d 100644
--- a/Unreal/Plugins/AirSim/Source/Beacons/DynamicRackBeacon.h
+++ b/Unreal/Plugins/AirSim/Source/Beacons/DynamicRackBeacon.h
@@ -4,6 +4,8 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/Actor.h"
+#include "Components/StaticMeshComponent.h"
+#include <Engine/StaticMesh.h>
 #include "AirLib/include/common/AirSimSettings.hpp"
 
 #include "DynamicRackBeacon.generated.h"
diff --git a/Unreal/Plugins/AirSim/Source/Beacons/FiducialBeacon.h b/Unreal/Plugins/AirSim/Source/Beacons/FiducialBeacon.h
index 777d46f8f..82a1dae7f 100644
--- a/Unreal/Plugins/AirSim/Source/Beacons/FiducialBeacon.h
+++ b/Unreal/Plugins/AirSim/Source/Beacons/FiducialBeacon.h
@@ -3,6 +3,11 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "Materials/Material.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "Components/StaticMeshComponent.h"
+#include <Engine/StaticMesh.h>
+#include "Engine/Texture2D.h"
 #include "GameFramework/Actor.h"
 #include "FiducialBeacon.generated.h"
 
diff --git a/Unreal/Plugins/AirSim/Source/Beacons/TemplateBeacon.h b/Unreal/Plugins/AirSim/Source/Beacons/TemplateBeacon.h
index cf2f3433c..074468a61 100644
--- a/Unreal/Plugins/AirSim/Source/Beacons/TemplateBeacon.h
+++ b/Unreal/Plugins/AirSim/Source/Beacons/TemplateBeacon.h
@@ -4,6 +4,8 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/Actor.h"
+#include "Components/StaticMeshComponent.h"
+#include <Engine/StaticMesh.h>
 #include "AirLib/include/common/AirSimSettings.hpp"
 
 #include "TemplateBeacon.generated.h"
diff --git a/Unreal/Plugins/AirSim/Source/Beacons/UWBBeacon.h b/Unreal/Plugins/AirSim/Source/Beacons/UWBBeacon.h
index 39bafecce..3e27e0c43 100644
--- a/Unreal/Plugins/AirSim/Source/Beacons/UWBBeacon.h
+++ b/Unreal/Plugins/AirSim/Source/Beacons/UWBBeacon.h
@@ -4,6 +4,8 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/Actor.h"
+#include "Components/StaticMeshComponent.h"
+#include <Engine/StaticMesh.h>
 #include "UWBBeacon.generated.h"
 
 UCLASS()
diff --git a/Unreal/Plugins/AirSim/Source/Beacons/WifiBeacon.h b/Unreal/Plugins/AirSim/Source/Beacons/WifiBeacon.h
index 81abaf74b..dc77d3feb 100644
--- a/Unreal/Plugins/AirSim/Source/Beacons/WifiBeacon.h
+++ b/Unreal/Plugins/AirSim/Source/Beacons/WifiBeacon.h
@@ -4,8 +4,9 @@
 
 #include "CoreMinimal.h"
 #include "GameFramework/Actor.h"
+#include "Components/StaticMeshComponent.h"
+#include <Engine/StaticMesh.h>
 #include "AirLib/include/common/AirSimSettings.hpp"
-
 #include "WifiBeacon.generated.h"
 
 
diff --git a/Unreal/Plugins/AirSim/Source/DetectionComponent.h b/Unreal/Plugins/AirSim/Source/DetectionComponent.h
index b50d9abaa..4eb9b9790 100644
--- a/Unreal/Plugins/AirSim/Source/DetectionComponent.h
+++ b/Unreal/Plugins/AirSim/Source/DetectionComponent.h
@@ -3,7 +3,15 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "GameFramework/Actor.h"
+#include "Engine/TextureRenderTarget2D.h"
+#include "Components/MeshComponent.h"
+#include "Components/ActorComponent.h"
 #include "Components/SceneComponent.h"
+#include "TextureResource.h"
+#include "Components/SceneCaptureComponent2D.h"
+#include "Components/SkinnedMeshComponent.h"
 #include "ObjectFilter.h"
 #include <string>
 #include "DetectionComponent.generated.h"
diff --git a/Unreal/Plugins/AirSim/Source/LidarCamera.h b/Unreal/Plugins/AirSim/Source/LidarCamera.h
index 7549a91cf..3ee92f07d 100644
--- a/Unreal/Plugins/AirSim/Source/LidarCamera.h
+++ b/Unreal/Plugins/AirSim/Source/LidarCamera.h
@@ -6,12 +6,17 @@
 #include "Containers/Queue.h"
 #include "RHIGPUReadback.h"
 #include "common/WorkerThread.hpp"
-#include "Components/SceneCaptureComponent2D.h"
+#include "UObject/ObjectMacros.h"
+#include "GameFramework/Actor.h"
+#include "Engine/TextureRenderTarget2D.h"
 #include "Components/ArrowComponent.h"
 #include "Components/StaticMeshComponent.h"
+#include "Components/SceneCaptureComponent2D.h"
+#include "Components/SkinnedMeshComponent.h"
 #include "Camera/CameraActor.h"
 #include "Materials/Material.h"
 #include "Runtime/Core/Public/PixelFormat.h"
+#include "TextureResource.h"
 #include "common/AirSimSettings.hpp"
 #include "AirBlueprintLib.h"
 #include "sensors/lidar/GPULidarSimple.hpp"
diff --git a/Unreal/Plugins/AirSim/Source/PIPCamera.h b/Unreal/Plugins/AirSim/Source/PIPCamera.h
index 62d795f08..f27738718 100644
--- a/Unreal/Plugins/AirSim/Source/PIPCamera.h
+++ b/Unreal/Plugins/AirSim/Source/PIPCamera.h
@@ -8,6 +8,8 @@
 #include "Annotation/ObjectAnnotator.h"
 #include "common/ImageCaptureBase.hpp"
 #include "common/common_utils/Utils.hpp"
+#include "Components/StaticMeshComponent.h"
+#include <Engine/StaticMesh.h>
 #include "common/AirSimSettings.hpp"
 #include "NedTransform.h"
 #include "DetectionComponent.h"
diff --git a/Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.h b/Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.h
index 859b1b50c..19647b260 100644
--- a/Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.h
+++ b/Unreal/Plugins/AirSim/Source/SimMode/SimModeBase.h
@@ -10,6 +10,7 @@
 #include <string>
 #include "AirSimCameraDirector.h"
 #include "common/AirSimSettings.hpp"
+#include "AssetRegistry/AssetData.h"
 #include "common/ClockFactory.hpp"
 #include "api/ApiServerBase.hpp"
 #include "api/ApiProvider.hpp"
diff --git a/Unreal/Plugins/AirSim/Source/SimMode/SimModeWorldBase.h b/Unreal/Plugins/AirSim/Source/SimMode/SimModeWorldBase.h
index 37be47fed..c9e21adac 100644
--- a/Unreal/Plugins/AirSim/Source/SimMode/SimModeWorldBase.h
+++ b/Unreal/Plugins/AirSim/Source/SimMode/SimModeWorldBase.h
@@ -5,6 +5,7 @@
 #include <vector>
 #include "Kismet/KismetSystemLibrary.h"
 #include "api/VehicleSimApiBase.hpp"
+#include "AssetRegistry/AssetData.h"
 #include "physics/PhysicsEngineBase.hpp"
 #include "physics/World.hpp"
 #include "physics/PhysicsWorld.hpp"
diff --git a/Unreal/Plugins/AirSim/Source/TextureShuffleActor.h b/Unreal/Plugins/AirSim/Source/TextureShuffleActor.h
index 0467fa45d..51fa77181 100644
--- a/Unreal/Plugins/AirSim/Source/TextureShuffleActor.h
+++ b/Unreal/Plugins/AirSim/Source/TextureShuffleActor.h
@@ -2,6 +2,14 @@
 
 #include "CoreMinimal.h"
 #include "Materials/Material.h"
+#include "UObject/ObjectMacros.h"
+#include "GameFramework/Actor.h"
+#include "PhysicalMaterials/PhysicalMaterial.h"
+#include "Materials/MaterialInterface.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "Engine/Texture2D.h"
+#include "Components/StaticMeshComponent.h"
+#include "Engine/TextureRenderTarget2D.h"
 #include "common/common_utils/Utils.hpp"
 #include "common/AirSimSettings.hpp"
 #include "Engine/StaticMeshActor.h"
diff --git a/Unreal/Plugins/AirSim/Source/UnrealImageCapture.h b/Unreal/Plugins/AirSim/Source/UnrealImageCapture.h
index 7320c6479..9832fc135 100644
--- a/Unreal/Plugins/AirSim/Source/UnrealImageCapture.h
+++ b/Unreal/Plugins/AirSim/Source/UnrealImageCapture.h
@@ -2,6 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "PIPCamera.h"
+#include "UnrealClient.h"
 #include "common/ImageCaptureBase.hpp"
 #include "common/common_utils/UniqueValueMap.hpp"
 
diff --git a/Unreal/Plugins/AirSim/Source/UnrealSensors/UnrealEchoSensor.cpp b/Unreal/Plugins/AirSim/Source/UnrealSensors/UnrealEchoSensor.cpp
index 7044b6a00..64f40d6c4 100755
--- a/Unreal/Plugins/AirSim/Source/UnrealSensors/UnrealEchoSensor.cpp
+++ b/Unreal/Plugins/AirSim/Source/UnrealSensors/UnrealEchoSensor.cpp
@@ -3,6 +3,7 @@
 #include "UnrealEchoSensor.h"
 #include "AirBlueprintLib.h"
 #include "common/Common.hpp"
+#include "Async/ParallelFor.h"
 #include "NedTransform.h"
 #include "DrawDebugHelpers.h"
 #include "EngineUtils.h"
diff --git a/Unreal/Plugins/AirSim/Source/UnrealSensors/UnrealLidarSensor.cpp b/Unreal/Plugins/AirSim/Source/UnrealSensors/UnrealLidarSensor.cpp
index 5d85c1121..063606bdd 100755
--- a/Unreal/Plugins/AirSim/Source/UnrealSensors/UnrealLidarSensor.cpp
+++ b/Unreal/Plugins/AirSim/Source/UnrealSensors/UnrealLidarSensor.cpp
@@ -4,6 +4,7 @@
 #include "UnrealLidarSensor.h"
 #include "AirBlueprintLib.h"
 #include "common/Common.hpp"
+#include "Async/ParallelFor.h"
 #include "NedTransform.h"
 #include "DrawDebugHelpers.h"
 #include "Engine/Engine.h"
diff --git a/Unreal/Plugins/AirSim/Source/Vehicles/ComputerVision/SimModeComputerVision.cpp b/Unreal/Plugins/AirSim/Source/Vehicles/ComputerVision/SimModeComputerVision.cpp
index c541f9c0c..809903669 100644
--- a/Unreal/Plugins/AirSim/Source/Vehicles/ComputerVision/SimModeComputerVision.cpp
+++ b/Unreal/Plugins/AirSim/Source/Vehicles/ComputerVision/SimModeComputerVision.cpp
@@ -25,21 +25,6 @@ void ASimModeComputerVision::initializePauseState()
 	pause(false);
 }
 
-bool ASimModeComputerVision::isPaused() const
-{
-	return current_clockspeed_ == 0;
-}
-
-void ASimModeComputerVision::pause(bool is_paused)
-{
-	if (is_paused)
-		current_clockspeed_ = 0;
-	else
-		current_clockspeed_ = getSettings().clock_speed;
-
-	UAirBlueprintLib::setUnrealClockSpeed(this, current_clockspeed_);
-}
-
 void ASimModeComputerVision::continueForTime(double seconds)
 {
 	pause_period_start_ = ClockFactory::get()->nowNanos();
diff --git a/Unreal/Plugins/AirSim/Source/Vehicles/ComputerVision/SimModeComputerVision.h b/Unreal/Plugins/AirSim/Source/Vehicles/ComputerVision/SimModeComputerVision.h
index 4fd471ac1..5402a043a 100644
--- a/Unreal/Plugins/AirSim/Source/Vehicles/ComputerVision/SimModeComputerVision.h
+++ b/Unreal/Plugins/AirSim/Source/Vehicles/ComputerVision/SimModeComputerVision.h
@@ -2,12 +2,10 @@
 
 #include "CoreMinimal.h"
 
+#include "SimMode/SimModeBase.h"
 #include "ComputerVisionPawn.h"
 #include "common/Common.hpp"
-#include "ComputerVisionPawnSimApi.h"
 #include "api/VehicleSimApiBase.hpp"
-#include "SimMode/SimModeBase.h"
-
 #include "SimModeComputerVision.generated.h"
 
 
@@ -19,8 +17,6 @@ class AIRSIM_API ASimModeComputerVision : public ASimModeBase
 	virtual void BeginPlay() override;
 	virtual void Tick(float DeltaSeconds) override;
 
-	virtual bool isPaused() const override;
-	virtual void pause(bool is_paused) override;
 	virtual void continueForTime(double seconds) override;
 	virtual void continueForFrames(uint32_t frames) override;
 
diff --git a/Unreal/Plugins/AirSim/Source/Vehicles/SkidSteer/SimModeSkidVehicle.cpp b/Unreal/Plugins/AirSim/Source/Vehicles/SkidSteer/SimModeSkidVehicle.cpp
index 703e56ec5..20fd91202 100644
--- a/Unreal/Plugins/AirSim/Source/Vehicles/SkidSteer/SimModeSkidVehicle.cpp
+++ b/Unreal/Plugins/AirSim/Source/Vehicles/SkidSteer/SimModeSkidVehicle.cpp
@@ -27,21 +27,6 @@ void ASimModeSkidVehicle::initializePauseState()
 	pause(false);
 }
 
-bool ASimModeSkidVehicle::isPaused() const
-{
-	return current_clockspeed_ == 0;
-}
-
-void ASimModeSkidVehicle::pause(bool is_paused)
-{
-	if (is_paused)
-		current_clockspeed_ = 0;
-	else
-		current_clockspeed_ = getSettings().clock_speed;
-
-	UAirBlueprintLib::setUnrealClockSpeed(this, current_clockspeed_);
-}
-
 void ASimModeSkidVehicle::continueForTime(double seconds)
 {
 	pause_period_start_ = ClockFactory::get()->nowNanos();
diff --git a/Unreal/Plugins/AirSim/Source/Vehicles/SkidSteer/SimModeSkidVehicle.h b/Unreal/Plugins/AirSim/Source/Vehicles/SkidSteer/SimModeSkidVehicle.h
index 86bd60ff0..84579fb30 100644
--- a/Unreal/Plugins/AirSim/Source/Vehicles/SkidSteer/SimModeSkidVehicle.h
+++ b/Unreal/Plugins/AirSim/Source/Vehicles/SkidSteer/SimModeSkidVehicle.h
@@ -22,8 +22,6 @@ class AIRSIM_API ASimModeSkidVehicle : public ASimModeBase
 	virtual void BeginPlay() override;
 	virtual void Tick(float DeltaSeconds) override;
 
-	virtual bool isPaused() const override;
-	virtual void pause(bool is_paused) override;
 	virtual void continueForTime(double seconds) override;
 	virtual void continueForFrames(uint32_t frames) override;
 
diff --git a/Unreal/Plugins/AirSim/Source/WorldSimApi.h b/Unreal/Plugins/AirSim/Source/WorldSimApi.h
index faad4bf6b..cf2a94ece 100644
--- a/Unreal/Plugins/AirSim/Source/WorldSimApi.h
+++ b/Unreal/Plugins/AirSim/Source/WorldSimApi.h
@@ -6,6 +6,7 @@
 #include "api/WorldSimApiBase.hpp"
 #include "SimMode/SimModeBase.h"
 #include "Components/StaticMeshComponent.h"
+#include "AssetRegistry/AssetData.h"
 #include "Runtime/Engine/Classes/Engine/StaticMesh.h"
 #include <string>