diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/FBXImport/MapProcessCommandlet.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/FBXImport/MapProcessCommandlet.cpp
index c70011cd8..4a65ca0d5 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/FBXImport/MapProcessCommandlet.cpp
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/FBXImport/MapProcessCommandlet.cpp
@@ -27,7 +27,7 @@ UMapProcessCommandlet::UMapProcessCommandlet()
   MarkingNodeMaterialAux = (UMaterial *) RoadNodeAux.Object;
   #endif
 }
-#if WITH_EDITOR
+#if WITH_EDITORONLY_DATA
 
 bool UMapProcessCommandlet::ParseParams(const FString& InParams)
 {
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/FBXImport/MapProcessCommandlet.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/FBXImport/MapProcessCommandlet.h
index 47a093cb6..3c9413f67 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/FBXImport/MapProcessCommandlet.h
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/FBXImport/MapProcessCommandlet.h
@@ -8,11 +8,11 @@
 #include "CoreMinimal.h"
 #include <Runtime/Engine/Classes/Engine/ObjectLibrary.h>
 #include <OpenDriveActor.h>
-#if WITH_EDITOR
+#if WITH_EDITORONLY_DATA
 #include <Developer/AssetTools/Public/IAssetTools.h>
 #include <Developer/AssetTools/Public/AssetToolsModule.h>
 #include <AssetRegistry/Public/AssetRegistryModule.h>
-#endif //WITH_EDITOR
+#endif //WITH_EDITORONLY_DATA
 #include <Runtime/Engine/Classes/Engine/StaticMeshActor.h>
 #include "MapProcessCommandlet.generated.h"
 
@@ -25,7 +25,7 @@ class UMapProcessCommandlet
 public:
   /** Default constructor. */
   UMapProcessCommandlet();
-  #if WITH_EDITOR
+  #if WITH_EDITORONLY_DATA
 
   /**
 	 * Parses the command line parameters
@@ -73,7 +73,7 @@ public:
    */
   virtual int32 Main(const FString &Params) override;
 
-#endif
+#endif //WITH_EDITORONLY_DATA
 private: