diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorDescription.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorDescription.h
index 23c2847d4..45927eaac 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorDescription.h
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorDescription.h
@@ -6,8 +6,9 @@
 
 #pragma once
 
+#include "CoreMinimal.h"
 #include "Carla/Actor/ActorAttribute.h"
-
+#include "GameFramework/Actor.h"
 #include "ActorDescription.generated.h"
 
 /// A description of a Carla Actor with all its variation.
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.h
index ed3c0ad3a..5bb22bf44 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.h
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/CarlaWheeledVehicle.h
@@ -17,9 +17,8 @@
 #include "Vehicle/VehicleInputPriority.h"
 #include "Vehicle/VehiclePhysicsControl.h"
 #include "VehicleVelocityControl.h"
-#include "WheeledVehicleMovementComponent4W.h"
-#include "WheeledVehicleMovementComponentNW.h"
-#include "VehicleAnimInstance.h"
+#include "Vehicle/WheeledVehicleMovementComponentNW.h"
+#include "Vehicle/VehicleAnimInstance.h"
 #include "PhysicsEngine/PhysicsConstraintComponent.h"
 #include "MovementComponents/BaseCarlaMovementComponent.h"
 
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehiclePhysicsControl.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehiclePhysicsControl.h
index 619e8de7f..da6bff6f3 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehiclePhysicsControl.h
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/VehiclePhysicsControl.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include "Vehicle/WheelPhysicsControl.h"
+#include "Curves/RichCurve.h"
 #include "VehiclePhysicsControl.generated.h"
 
 USTRUCT(BlueprintType)
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.cpp
index 3a504c9e9..5dff3f31c 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.cpp
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.cpp
@@ -212,9 +212,9 @@ void SetupDriveHelper(const UWheeledVehicleMovementComponentNW* VehicleData, con
 }
 #endif
 
+#if 0 // @CARLAUE5
 void UWheeledVehicleMovementComponentNW::SetupVehicle()
 {
-#if 0 // @CARLAUE5
 	if (!UpdatedPrimitive)
 	{
 		return;
@@ -281,12 +281,12 @@ void UWheeledVehicleMovementComponentNW::SetupVehicle()
 	PVehicleDrive = PVehicleDriveNW;
 
 	SetUseAutoGears(TransmissionSetup.bUseGearAutoBox);
-#endif
 }
 
+
 void UWheeledVehicleMovementComponentNW::UpdateSimulation(float DeltaTime)
 {
-#if 0 // @CARLAUE5
+
 	if (PVehicleDrive == nullptr)
 		return;
 
@@ -324,12 +324,12 @@ void UWheeledVehicleMovementComponentNW::UpdateSimulation(float DeltaTime)
 		PxVehicleDriveNW* PVehicleDriveNW = (PxVehicleDriveNW*)PVehicleDrive;
 		PxVehicleDriveNWSmoothAnalogRawInputsAndSetAnalogInputs(SmoothData, SpeedSteerLookup, RawInputData, DeltaTime, false, *PVehicleDriveNW);
 	});
-#endif
+
 }
 
 void UWheeledVehicleMovementComponentNW::UpdateEngineSetup(const FVehicleNWEngineData& NewEngineSetup)
 {
-#if 0 // @CARLAUE5
+
 	if (PVehicleDrive)
 	{
 		PxVehicleEngineData EngineData;
@@ -338,12 +338,12 @@ void UWheeledVehicleMovementComponentNW::UpdateEngineSetup(const FVehicleNWEngin
 		PxVehicleDriveNW* PVehicleDriveNW = (PxVehicleDriveNW*)PVehicleDrive;
 		PVehicleDriveNW->mDriveSimData.setEngineData(EngineData);
 	}
-#endif
+
 }
 
 void UWheeledVehicleMovementComponentNW::UpdateDifferentialSetup(const TArray<FVehicleNWWheelDifferentialData>& NewDifferentialSetup)
 {
-#if 0 // @CARLAUE5
+
 	if (PVehicleDrive)
 	{
 		PxVehicleDifferentialNWData DifferentialData;
@@ -352,12 +352,12 @@ void UWheeledVehicleMovementComponentNW::UpdateDifferentialSetup(const TArray<FV
 		PxVehicleDriveNW* PVehicleDriveNW = (PxVehicleDriveNW*)PVehicleDrive;
 		PVehicleDriveNW->mDriveSimData.setDiffData(DifferentialData);
 	}
-#endif
+
 }
 
 void UWheeledVehicleMovementComponentNW::UpdateTransmissionSetup(const FVehicleNWTransmissionData& NewTransmissionSetup)
 {
-#if 0 // @CARLAUE5
+
 	if (PVehicleDrive)
 	{
 		PxVehicleGearsData GearData;
@@ -370,8 +370,8 @@ void UWheeledVehicleMovementComponentNW::UpdateTransmissionSetup(const FVehicleN
 		PVehicleDriveNW->mDriveSimData.setGearsData(GearData);
 		PVehicleDriveNW->mDriveSimData.setAutoBoxData(AutoBoxData);
 	}
-#endif
 }
+#endif
 
 #if 0 // @CARLAUE5
 void BackwardsConvertCm2ToM2NW(float& val, float defaultValue)
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.h
index 56ec6aaa5..20b45643e 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.h
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Vehicle/WheeledVehicleMovementComponentNW.h
@@ -5,7 +5,7 @@
 // For a copy, see <https://opensource.org/licenses/MIT>.
 
 #pragma once
-#include "WheeledVehicleMovementComponent.h"
+#include "ChaosWheeledVehicleMovementComponent.h"
 #include "Curves/CurveFloat.h"
 #include "WheeledVehicleMovementComponentNW.generated.h"
 
@@ -144,7 +144,6 @@ protected:
 	virtual const void* GetTireData(physx::PxVehicleWheels* Wheels, UVehicleWheel* Wheel);
 	virtual const int32 GetWheelShapeMapping(physx::PxVehicleWheels* Wheels, uint32 Wheel);
 	virtual const physx::PxVehicleWheelData GetWheelData(physx::PxVehicleWheels* Wheels, uint32 Wheel);
-#endif
 
 	/** Allocate and setup the PhysX vehicle */
 	virtual void SetupVehicle() override;
@@ -161,4 +160,5 @@ protected:
 
 	/** update simulation data: transmission */
 	virtual void UpdateTransmissionSetup(const FVehicleNWTransmissionData& NewGearSetup);
+#endif
 };
diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/Commandlet/GenerateTileCommandlet.cpp b/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/Commandlet/GenerateTileCommandlet.cpp
index e6752bbb5..69ca3ea12 100644
--- a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/Commandlet/GenerateTileCommandlet.cpp
+++ b/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/Private/Commandlet/GenerateTileCommandlet.cpp
@@ -4,7 +4,7 @@
 // This work is licensed under the terms of the MIT license.
 // For a copy, see <https://opensource.org/licenses/MIT>.
 
-#include "GenerateTileCommandlet.h"
+#include "Commandlet/GenerateTileCommandlet.h"
 
 #include <iostream>
 #include <fstream>