diff --git a/Kconfig.projbuild b/Kconfig.projbuild
index c1a9f4cb7..2085a11ea 100644
--- a/Kconfig.projbuild
+++ b/Kconfig.projbuild
@@ -355,7 +355,7 @@ config ARDUINO_SELECTIVE_ESPmDNS
 config ARDUINO_SELECTIVE_HTTPClient
     bool "Enable HTTPClient"
     depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_Network
-    select ARDUINO_SELECTIVE_WiFiClientSecure
+    select ARDUINO_SELECTIVE_NetworkClientSecure
     default y
 
 config ARDUINO_SELECTIVE_NetBIOS
@@ -375,7 +375,7 @@ config ARDUINO_SELECTIVE_WiFi
     default y
 
 config ARDUINO_SELECTIVE_NetworkClientSecure
-    bool "Enable WiFiClientSecure"
+    bool "Enable NetworkClientSecure"
     depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_Network
     default y
 
diff --git a/libraries/NetworkClientSecure/src/WiFiClientSecure.h b/libraries/NetworkClientSecure/src/WiFiClientSecure.h
index b4d6962fb..56e7f28aa 100644
--- a/libraries/NetworkClientSecure/src/WiFiClientSecure.h
+++ b/libraries/NetworkClientSecure/src/WiFiClientSecure.h
@@ -1,3 +1,3 @@
 #pragma once
 #include "NetworkClientSecure.h"
-#define WiFiClientSecure NetworkClientSecure
+typedef NetworkClientSecure WiFiClientSecure;
diff --git a/libraries/WebServer/examples/UploadHugeFile/UploadHugeFile.ino b/libraries/WebServer/examples/UploadHugeFile/UploadHugeFile.ino
index 030ac09d1..54c94ed61 100644
--- a/libraries/WebServer/examples/UploadHugeFile/UploadHugeFile.ino
+++ b/libraries/WebServer/examples/UploadHugeFile/UploadHugeFile.ino
@@ -1,5 +1,4 @@
 #include <WiFi.h>
-#include <WiFiClient.h>
 #include <WebServer.h>
 #include <uri/UriRegex.h>
 #include <SD.h>
diff --git a/libraries/WiFi/src/WiFiClient.h b/libraries/WiFi/src/WiFiClient.h
index 30729e279..4add805ca 100644
--- a/libraries/WiFi/src/WiFiClient.h
+++ b/libraries/WiFi/src/WiFiClient.h
@@ -1,3 +1,3 @@
 #pragma once
 #include "NetworkClient.h"
-#define WiFiClient NetworkClient
+typedef NetworkClient WiFiClient;
diff --git a/libraries/WiFi/src/WiFiServer.h b/libraries/WiFi/src/WiFiServer.h
index 39d984486..850bd98d9 100644
--- a/libraries/WiFi/src/WiFiServer.h
+++ b/libraries/WiFi/src/WiFiServer.h
@@ -1,3 +1,3 @@
 #pragma once
 #include "NetworkServer.h"
-#define WiFiServer NetworkServer
+typedef NetworkServer WiFiServer;
diff --git a/libraries/WiFi/src/WiFiUdp.h b/libraries/WiFi/src/WiFiUdp.h
index b0b11570f..420d29b63 100644
--- a/libraries/WiFi/src/WiFiUdp.h
+++ b/libraries/WiFi/src/WiFiUdp.h
@@ -1,3 +1,3 @@
 #pragma once
 #include "NetworkUdp.h"
-#define WiFiUDP NetworkUDP
+typedef NetworkUDP WiFiUDP;