diff --git a/mongoose.c b/mongoose.c
index de99f667..df80dfc3 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -4910,11 +4910,6 @@ void mg_mgr_free(struct mg_mgr *mgr) {
 #endif
 }
 
-
-#if MG_ENABLE_TCPIP && MG_ENABLE_TCPIP_DRIVER_INIT
-void mg_tcpip_auto_init(struct mg_mgr *);
-#endif
-
 void mg_mgr_init(struct mg_mgr *mgr) {
   memset(mgr, 0, sizeof(*mgr));
 #if MG_ENABLE_EPOLL
diff --git a/mongoose.h b/mongoose.h
index de92db02..0f17fae8 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -3412,15 +3412,6 @@ struct mg_tcpip_spi {
 #include "Driver_ETH_MAC.h"  // keep this include
 #include "Driver_ETH_PHY.h"  // keep this include
 
-#ifndef MG_MAC_ADDRESS
-#define MG_MAC_ADDRESS MG_MAC_ADDRESS_RANDOM
-#endif
-
-#define MG_TCPIP_DRIVER_DATA int driver_data;
-
-#define MG_TCPIP_DRIVER_CODE &mg_tcpip_driver_cmsis
-#define MG_TCPIP_DRIVER_NAME "cmsis"
-
 #endif
 
 
diff --git a/src/drivers/cmsis.h b/src/drivers/cmsis.h
index a264fc46..f8b4dadd 100644
--- a/src/drivers/cmsis.h
+++ b/src/drivers/cmsis.h
@@ -5,13 +5,4 @@
 #include "Driver_ETH_MAC.h"  // keep this include
 #include "Driver_ETH_PHY.h"  // keep this include
 
-#ifndef MG_MAC_ADDRESS
-#define MG_MAC_ADDRESS MG_MAC_ADDRESS_RANDOM
-#endif
-
-#define MG_TCPIP_DRIVER_DATA int driver_data;
-
-#define MG_TCPIP_DRIVER_CODE &mg_tcpip_driver_cmsis
-#define MG_TCPIP_DRIVER_NAME "cmsis"
-
 #endif
diff --git a/src/net.c b/src/net.c
index 5d0e4057..af51b649 100644
--- a/src/net.c
+++ b/src/net.c
@@ -276,11 +276,6 @@ void mg_mgr_free(struct mg_mgr *mgr) {
 #endif
 }
 
-
-#if MG_ENABLE_TCPIP && MG_ENABLE_TCPIP_DRIVER_INIT
-void mg_tcpip_auto_init(struct mg_mgr *);
-#endif
-
 void mg_mgr_init(struct mg_mgr *mgr) {
   memset(mgr, 0, sizeof(*mgr));
 #if MG_ENABLE_EPOLL