diff --git a/ampel-firmware/util.h b/ampel-firmware/util.h
index c9a8a943aaf0af03dc933e171070c56eb7a93eab..4bd28109b1979ab97cd743f0867f370853b46f57 100644
--- a/ampel-firmware/util.h
+++ b/ampel-firmware/util.h
@@ -2,7 +2,6 @@
 #define AMPEL_UTIL_H_INCLUDED
 #include <Arduino.h>
 #include "config.h"
-#include "wifi_util.h" // To get MAC
 #ifdef AMPEL_CSV
 #  include "csv_writer.h" // To close filesystem before reset
 #endif
@@ -12,9 +11,11 @@
 
 #if defined(ESP8266)
 #  define BOARD "ESP8266"
+#  include <ESP8266WiFi.h>
 #  define get_free_heap_size() system_get_free_heap_size()
 #elif defined(ESP32)
 #  define BOARD "ESP32"
+#  include <WiFi.h>
 #  define get_free_heap_size() esp_get_free_heap_size()
 #else
 #  define BOARD "Unknown"
diff --git a/ampel-firmware/wifi_util.cpp b/ampel-firmware/wifi_util.cpp
index 32de8f93cf95776da216c2e965aa39a7af6d4e07..5160b52b5365e77fc31e5bfda24198ac02284515 100644
--- a/ampel-firmware/wifi_util.cpp
+++ b/ampel-firmware/wifi_util.cpp
@@ -16,7 +16,7 @@ namespace config {
 void WiFiConnect(const String &hostname) {
   //NOTE: WiFi Multi could allow multiple SSID and passwords.
   WiFi.persistent(false); // Don't write user & password to Flash.
-  WiFi.mode(WIFI_STA); // Set ESP8266 to be a WiFi-client only
+  WiFi.mode(WIFI_STA); // Set ESP to be a WiFi-client only
 #if defined(ESP8266)
     WiFi.hostname(hostname);
 #elif defined(ESP32)
diff --git a/ampel-firmware/wifi_util.h b/ampel-firmware/wifi_util.h
index d6303fbf0c50f7ff62d2c0f583767c40bc912eda..3fb47131c03959f706898793f9dc545dbb5ee85b 100644
--- a/ampel-firmware/wifi_util.h
+++ b/ampel-firmware/wifi_util.h
@@ -1,10 +1,5 @@
 #ifndef WIFI_UTIL_H_INCLUDED
-#  define WIFI_UTIL_H_INCLUDED
-#  if defined(ESP8266)
-#    include <ESP8266WiFi.h>
-#  elif defined(ESP32)
-#    include <WiFi.h>
-#  endif
+#define WIFI_UTIL_H_INCLUDED
 
 #include "led_effects.h"
 #include "config.h"