diff --git a/Source/Carla/Carla.h b/Source/Carla/Carla.h
index cd8de7a90..b44bb2e9c 100644
--- a/Source/Carla/Carla.h
+++ b/Source/Carla/Carla.h
@@ -12,7 +12,7 @@ DECLARE_LOG_CATEGORY_EXTERN(LogCarla, Log, All);
 DECLARE_LOG_CATEGORY_EXTERN(LogCarlaServer, Log, All);
 
 // Options to compile with extra debug options.
-#ifdef WITH_EDITOR
+#if WITH_EDITOR
 // #define CARLA_ROAD_GENERATOR_EXTRA_LOG /// @todo #1 Crashes in Linux.
 // #define CARLA_SERVER_EXTRA_LOG
 // #define CARLA_TAGGER_EXTRA_LOG
diff --git a/Source/Carla/CityMapGenerator.cpp b/Source/Carla/CityMapGenerator.cpp
index 743fa3378..a1ac89e94 100644
--- a/Source/Carla/CityMapGenerator.cpp
+++ b/Source/Carla/CityMapGenerator.cpp
@@ -276,7 +276,7 @@ void ACityMapGenerator::GenerateRoadMap()
     }
   }
 
-#ifdef WITH_EDITOR
+#if WITH_EDITOR
   RoadMap->Log();
 #endif // WITH_EDITOR
 
@@ -286,7 +286,7 @@ void ACityMapGenerator::GenerateRoadMap()
     RoadMap->SaveAsPNG(FilePath);
   }
 
-#ifdef WITH_EDITOR
+#if WITH_EDITOR
   RoadMap->DrawDebugPixelsToLevel(GetWorld(), !bDrawDebugPixelsToLevel);
 #endif // WITH_EDITOR
 }
diff --git a/Source/Carla/MapGen/RoadMap.cpp b/Source/Carla/MapGen/RoadMap.cpp
index 0b96ee84d..a51914e07 100644
--- a/Source/Carla/MapGen/RoadMap.cpp
+++ b/Source/Carla/MapGen/RoadMap.cpp
@@ -5,7 +5,7 @@
 
 #include "HighResScreenshot.h"
 
-#ifdef WITH_EDITOR
+#if WITH_EDITOR
 #include "DrawDebugHelpers.h"
 #endif // WITH_EDITOR
 
@@ -261,7 +261,7 @@ bool URoadMap::SaveAsPNG(const FString &Path) const
   return true;
 }
 
-#ifdef WITH_EDITOR
+#if WITH_EDITOR
 
 void URoadMap::Log() const
 {
diff --git a/Source/Carla/MapGen/RoadMap.h b/Source/Carla/MapGen/RoadMap.h
index 3ba073526..22a3aca3c 100644
--- a/Source/Carla/MapGen/RoadMap.h
+++ b/Source/Carla/MapGen/RoadMap.h
@@ -141,7 +141,7 @@ public:
   /// Save the current map as PNG with the pixel data encoded as color.
   bool SaveAsPNG(const FString &Path) const;
 
-#ifdef WITH_EDITOR
+#if WITH_EDITOR
 
   /// Log status of the map to the console.
   void Log() const;