Merge pull request #988 from carla-simulator/fix_win32_compilation

Fix win32 compilation

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Actor/ActorAttribute.h

@@ -6,7 +6,9 @@
 
 #pragma once
 
+#include <compiler/disable-ue4-macros.h>
 #include <carla/rpc/ActorAttributeType.h>
+#include <compiler/enable-ue4-macros.h>
 
 #include "ActorAttribute.generated.h"
 

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.h

@@ -4,9 +4,10 @@
 // plugin.
 #pragma once
 
-#include "ModuleManager.h"
 
 #include "Util/NonCopyable.h"
+#include "Logging/LogMacros.h"
+#include "Modules/ModuleInterface.h"
 
 DECLARE_LOG_CATEGORY_EXTERN(LogCarla, Log, All);
 DECLARE_LOG_CATEGORY_EXTERN(LogCarlaServer, Log, All);

Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Util/OpenDrive.cpp

@@ -7,8 +7,6 @@
 #include "Carla.h"
 #include "Carla/Util/OpenDrive.h"
 
-#include "Engine.h"
-
 FString FOpenDrive::Load(FString MapName)
 {
 #if WITH_EDITOR