diff --git a/csv_writer.cpp b/csv_writer.cpp
index 8e2ac43de65186af53b0409d06c52bcf77392037..fee394c27c850ee1239959ded62b479b8c41789c 100644
--- a/csv_writer.cpp
+++ b/csv_writer.cpp
@@ -45,9 +45,7 @@ namespace csv_writer {
       }
     }
   }
-#endif
-
-#if defined(ESP32)
+#elif defined(ESP32)
   /**
    * SPECIFIC FUNCTIONS FOR SPIFFS
    */
diff --git a/web_server.cpp b/web_server.cpp
index ee944587e19e66e2501edef42a6ed24b576900fa..d8e824e4162c5f22c54bcebd2667e335a0336039 100644
--- a/web_server.cpp
+++ b/web_server.cpp
@@ -29,8 +29,7 @@ namespace web_server {
 
 #if defined(ESP8266)
   ESP8266WebServer http(80); // Create a webserver object that listens for HTTP request on port 80
-#endif
-#if defined(ESP32)
+#elif defined(ESP32)
   WebServer http(80);
 #endif
 
diff --git a/web_server.h b/web_server.h
index 69a298138416e50af41babca4bee8767a2eed94a..124253d5ce07d5840f01908099e2c442b2e93fe1 100644
--- a/web_server.h
+++ b/web_server.h
@@ -2,8 +2,7 @@
 #define WEB_SERVER_H_
 #if defined(ESP8266)
 #  include <ESP8266WebServer.h>
-#endif
-#if defined(ESP32)
+#elif defined(ESP32)
 #  include <WebServer.h>
 #endif
 
diff --git a/wifi_util.cpp b/wifi_util.cpp
index 5399143d4cef07977f4e3115776d685a1fcb126e..f8c0230c0ffefeb06ee5ff3bd31a0adfa7a99898 100644
--- a/wifi_util.cpp
+++ b/wifi_util.cpp
@@ -30,8 +30,7 @@ void WiFiConnect(const String &hostname) {
   WiFi.mode(WIFI_STA);  // Set ESP8266 to be a WiFi-client only
 #if defined(ESP8266)
     WiFi.hostname(hostname);
-#endif
-#if defined(ESP32)
+#elif defined(ESP32)
   WiFi.setHostname(hostname.c_str());
 #endif