diff --git a/examples/stm32/nucleo-f429zi-cube-baremetal/.cproject b/examples/stm32/nucleo-f429zi-cube-baremetal/.cproject
index 26a6f5d6..34f4362c 100644
--- a/examples/stm32/nucleo-f429zi-cube-baremetal/.cproject
+++ b/examples/stm32/nucleo-f429zi-cube-baremetal/.cproject
@@ -40,6 +40,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1904375652" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.156494483" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="MG_ENABLE_DRIVER_STM32=1"/>
 									<listOptionValue builtIn="false" value="HTTP_URL=&quot;http://0.0.0.0/&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32F429xx"/>
@@ -198,6 +199,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.656058677" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1004731843" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="MG_ENABLE_DRIVER_STM32=1"/>
 									<listOptionValue builtIn="false" value="HTTP_URL=&quot;http://0.0.0.0/&quot;"/>
 									<listOptionValue builtIn="false" value="UART_DEBUG=USART1"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
diff --git a/examples/stm32/nucleo-f429zi-cube-baremetal/Core/Inc/mongoose_custom.h b/examples/stm32/nucleo-f429zi-cube-baremetal/Core/Inc/mongoose_custom.h
index d8355cb6..37217804 100644
--- a/examples/stm32/nucleo-f429zi-cube-baremetal/Core/Inc/mongoose_custom.h
+++ b/examples/stm32/nucleo-f429zi-cube-baremetal/Core/Inc/mongoose_custom.h
@@ -17,7 +17,6 @@
 // Translate to Mongoose macros
 #if MG_CMSISPACK_NET == 0
 #define MG_ENABLE_TCPIP 1
-#define MG_ENABLE_DRIVER_STM32 1
 #elif MG_CMSISPACK_NET == 1
 #define MG_ENABLE_LWIP 1
 #elif MG_CMSISPACK_NET == 2
diff --git a/examples/stm32/nucleo-f429zi-cube-freertos-lwip/.cproject b/examples/stm32/nucleo-f429zi-cube-freertos-lwip/.cproject
index 6b3f4809..893265a7 100644
--- a/examples/stm32/nucleo-f429zi-cube-freertos-lwip/.cproject
+++ b/examples/stm32/nucleo-f429zi-cube-freertos-lwip/.cproject
@@ -41,6 +41,7 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.156494483" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
 									<listOptionValue builtIn="false" value="MEMP_NUM_NETCONN=10"/>
+									<listOptionValue builtIn="false" value="MG_ENABLE_DRIVER_STM32=1"/>
 									<listOptionValue builtIn="false" value="HTTP_URL=&quot;http://0.0.0.0/&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32F429xx"/>
@@ -244,6 +245,7 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1004731843" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
 									<listOptionValue builtIn="false" value="MEMP_NUM_NETCONN=10"/>
+									<listOptionValue builtIn="false" value="MG_ENABLE_DRIVER_STM32=1"/>
 									<listOptionValue builtIn="false" value="HTTP_URL=&quot;http://0.0.0.0/&quot;"/>
 									<listOptionValue builtIn="false" value="UART_DEBUG=USART1"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
diff --git a/examples/stm32/nucleo-f429zi-cube-freertos-lwip/Core/Inc/mongoose_custom.h b/examples/stm32/nucleo-f429zi-cube-freertos-lwip/Core/Inc/mongoose_custom.h
index 96a2532d..f4238f40 100644
--- a/examples/stm32/nucleo-f429zi-cube-freertos-lwip/Core/Inc/mongoose_custom.h
+++ b/examples/stm32/nucleo-f429zi-cube-freertos-lwip/Core/Inc/mongoose_custom.h
@@ -17,7 +17,6 @@
 // Translate to Mongoose macros
 #if MG_STMPACK_NET == 0
 #define MG_ENABLE_TCPIP 1
-#define MG_ENABLE_DRIVER_STM32 1
 #elif MG_STMPACK_NET == 1
 #define MG_ENABLE_LWIP 1
 #elif MG_STMPACK_NET == 2
diff --git a/examples/stm32/nucleo-f429zi-cube-freertos/.cproject b/examples/stm32/nucleo-f429zi-cube-freertos/.cproject
index d4ffdaef..65324ca4 100644
--- a/examples/stm32/nucleo-f429zi-cube-freertos/.cproject
+++ b/examples/stm32/nucleo-f429zi-cube-freertos/.cproject
@@ -40,6 +40,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1904375652" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.156494483" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="MG_ENABLE_DRIVER_STM32=1"/>
 									<listOptionValue builtIn="false" value="HTTP_URL=&quot;http://0.0.0.0/&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32F429xx"/>
@@ -206,6 +207,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.656058677" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1004731843" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="MG_ENABLE_DRIVER_STM32=1"/>
 									<listOptionValue builtIn="false" value="HTTP_URL=&quot;http://0.0.0.0/&quot;"/>
 									<listOptionValue builtIn="false" value="UART_DEBUG=USART1"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
diff --git a/examples/stm32/nucleo-f429zi-cube-freertos/Core/Inc/mongoose_custom.h b/examples/stm32/nucleo-f429zi-cube-freertos/Core/Inc/mongoose_custom.h
index d9b2f8c7..4c3dab86 100644
--- a/examples/stm32/nucleo-f429zi-cube-freertos/Core/Inc/mongoose_custom.h
+++ b/examples/stm32/nucleo-f429zi-cube-freertos/Core/Inc/mongoose_custom.h
@@ -17,7 +17,6 @@
 // Translate to Mongoose macros
 #if MG_STMPACK_NET == 0
 #define MG_ENABLE_TCPIP 1
-#define MG_ENABLE_DRIVER_STM32 1
 #elif MG_STMPACK_NET == 1
 #define MG_ENABLE_LWIP 1
 #elif MG_STMPACK_NET == 2
diff --git a/examples/stm32/nucleo-f746zg-cube-baremetal/.cproject b/examples/stm32/nucleo-f746zg-cube-baremetal/.cproject
index 127f3974..e676778d 100644
--- a/examples/stm32/nucleo-f746zg-cube-baremetal/.cproject
+++ b/examples/stm32/nucleo-f746zg-cube-baremetal/.cproject
@@ -39,6 +39,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.656778761" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1784614787" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="MG_ENABLE_DRIVER_STM32=1"/>
 									<listOptionValue builtIn="false" value="HTTP_URL=&quot;http://0.0.0.0/&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32F746xx"/>
@@ -199,6 +200,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1892970613" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.850191092" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="MG_ENABLE_DRIVER_STM32=1"/>
 									<listOptionValue builtIn="false" value="UART_DEBUG=USART1"/>
 									<listOptionValue builtIn="false" value="HTTP_URL=&quot;http://0.0.0.0/&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
diff --git a/examples/stm32/nucleo-f746zg-cube-baremetal/Core/Inc/mongoose_custom.h b/examples/stm32/nucleo-f746zg-cube-baremetal/Core/Inc/mongoose_custom.h
index d8355cb6..37217804 100644
--- a/examples/stm32/nucleo-f746zg-cube-baremetal/Core/Inc/mongoose_custom.h
+++ b/examples/stm32/nucleo-f746zg-cube-baremetal/Core/Inc/mongoose_custom.h
@@ -17,7 +17,6 @@
 // Translate to Mongoose macros
 #if MG_CMSISPACK_NET == 0
 #define MG_ENABLE_TCPIP 1
-#define MG_ENABLE_DRIVER_STM32 1
 #elif MG_CMSISPACK_NET == 1
 #define MG_ENABLE_LWIP 1
 #elif MG_CMSISPACK_NET == 2
diff --git a/examples/stm32/nucleo-f746zg-cube-freertos-lwip/.cproject b/examples/stm32/nucleo-f746zg-cube-freertos-lwip/.cproject
index 1a82765e..8c7606a6 100644
--- a/examples/stm32/nucleo-f746zg-cube-freertos-lwip/.cproject
+++ b/examples/stm32/nucleo-f746zg-cube-freertos-lwip/.cproject
@@ -39,6 +39,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.656778761" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1784614787" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="MG_ENABLE_DRIVER_STM32=1"/>
 									<listOptionValue builtIn="false" value="HTTP_URL=&quot;http://0.0.0.0/&quot;"/>
 									<listOptionValue builtIn="false" value="MEMP_NUM_NETCONN=10"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
@@ -244,6 +245,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.633096995" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.567147392" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="MG_ENABLE_DRIVER_STM32=1"/>
 									<listOptionValue builtIn="false" value="UART_DEBUG=USART1"/>
 									<listOptionValue builtIn="false" value="HTTP_URL=&quot;http://0.0.0.0/&quot;"/>
 									<listOptionValue builtIn="false" value="MEMP_NUM_NETCONN=10"/>
diff --git a/examples/stm32/nucleo-f746zg-cube-freertos-lwip/Core/Inc/mongoose_custom.h b/examples/stm32/nucleo-f746zg-cube-freertos-lwip/Core/Inc/mongoose_custom.h
index 96a2532d..f4238f40 100644
--- a/examples/stm32/nucleo-f746zg-cube-freertos-lwip/Core/Inc/mongoose_custom.h
+++ b/examples/stm32/nucleo-f746zg-cube-freertos-lwip/Core/Inc/mongoose_custom.h
@@ -17,7 +17,6 @@
 // Translate to Mongoose macros
 #if MG_STMPACK_NET == 0
 #define MG_ENABLE_TCPIP 1
-#define MG_ENABLE_DRIVER_STM32 1
 #elif MG_STMPACK_NET == 1
 #define MG_ENABLE_LWIP 1
 #elif MG_STMPACK_NET == 2
diff --git a/examples/stm32/nucleo-f746zg-cube-freertos/.cproject b/examples/stm32/nucleo-f746zg-cube-freertos/.cproject
index ce371f2d..7b0d21a0 100644
--- a/examples/stm32/nucleo-f746zg-cube-freertos/.cproject
+++ b/examples/stm32/nucleo-f746zg-cube-freertos/.cproject
@@ -39,6 +39,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.656778761" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1784614787" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="MG_ENABLE_DRIVER_STM32=1"/>
 									<listOptionValue builtIn="false" value="HTTP_URL=&quot;http://0.0.0.0/&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32F746xx"/>
@@ -207,6 +208,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.546105713" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.508373843" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="MG_ENABLE_DRIVER_STM32=1"/>
 									<listOptionValue builtIn="false" value="UART_DEBUG=USART1"/>
 									<listOptionValue builtIn="false" value="HTTP_URL=&quot;http://0.0.0.0/&quot;"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
diff --git a/examples/stm32/nucleo-f746zg-cube-freertos/Core/Inc/mongoose_custom.h b/examples/stm32/nucleo-f746zg-cube-freertos/Core/Inc/mongoose_custom.h
index d9b2f8c7..4c3dab86 100644
--- a/examples/stm32/nucleo-f746zg-cube-freertos/Core/Inc/mongoose_custom.h
+++ b/examples/stm32/nucleo-f746zg-cube-freertos/Core/Inc/mongoose_custom.h
@@ -17,7 +17,6 @@
 // Translate to Mongoose macros
 #if MG_STMPACK_NET == 0
 #define MG_ENABLE_TCPIP 1
-#define MG_ENABLE_DRIVER_STM32 1
 #elif MG_STMPACK_NET == 1
 #define MG_ENABLE_LWIP 1
 #elif MG_STMPACK_NET == 2
diff --git a/examples/stm32/nucleo-f746zg-keil-baremetal/mongoose_custom.h b/examples/stm32/nucleo-f746zg-keil-baremetal/mongoose_custom.h
index 2a4a222f..f9f29417 100644
--- a/examples/stm32/nucleo-f746zg-keil-baremetal/mongoose_custom.h
+++ b/examples/stm32/nucleo-f746zg-keil-baremetal/mongoose_custom.h
@@ -65,7 +65,6 @@
 #endif
 #if MG_CMSISPACK_NET == 0
 #define MG_ENABLE_TCPIP 1
-#define MG_ENABLE_DRIVER_STM32 1
 #elif MG_CMSISPACK_NET == 1
 #define MG_ENABLE_LWIP 1
 #elif MG_CMSISPACK_NET == 2
@@ -76,3 +75,4 @@
 
 
 // Add your customization below this comment
+#define MG_ENABLE_DRIVER_STM32 1
diff --git a/examples/stm32/nucleo-f746zg-keil-freertos-lwip/mongoose_custom.h b/examples/stm32/nucleo-f746zg-keil-freertos-lwip/mongoose_custom.h
index f9cea591..b8e0019f 100644
--- a/examples/stm32/nucleo-f746zg-keil-freertos-lwip/mongoose_custom.h
+++ b/examples/stm32/nucleo-f746zg-keil-freertos-lwip/mongoose_custom.h
@@ -65,7 +65,6 @@
 #endif
 #if MG_CMSISPACK_NET == 0
 #define MG_ENABLE_TCPIP 1
-#define MG_ENABLE_DRIVER_STM32 1
 #elif MG_CMSISPACK_NET == 1
 #define MG_ENABLE_LWIP 1
 #elif MG_CMSISPACK_NET == 2
@@ -76,3 +75,4 @@
 
 
 // Add your customization below this comment
+#define MG_ENABLE_DRIVER_STM32 1
diff --git a/examples/stm32/nucleo-f746zg-keil-freertos-tcp/mongoose_custom.h b/examples/stm32/nucleo-f746zg-keil-freertos-tcp/mongoose_custom.h
index 2efd9df3..35353103 100644
--- a/examples/stm32/nucleo-f746zg-keil-freertos-tcp/mongoose_custom.h
+++ b/examples/stm32/nucleo-f746zg-keil-freertos-tcp/mongoose_custom.h
@@ -65,7 +65,6 @@
 #endif
 #if MG_CMSISPACK_NET == 0
 #define MG_ENABLE_TCPIP 1
-#define MG_ENABLE_DRIVER_STM32 1
 #elif MG_CMSISPACK_NET == 1
 #define MG_ENABLE_LWIP 1
 #elif MG_CMSISPACK_NET == 2
@@ -76,3 +75,4 @@
 
 
 // Add your customization below this comment
+#define MG_ENABLE_DRIVER_STM32 1
diff --git a/examples/stm32/nucleo-f746zg-keil-freertos/mongoose_custom.h b/examples/stm32/nucleo-f746zg-keil-freertos/mongoose_custom.h
index b361b5fe..c64de147 100644
--- a/examples/stm32/nucleo-f746zg-keil-freertos/mongoose_custom.h
+++ b/examples/stm32/nucleo-f746zg-keil-freertos/mongoose_custom.h
@@ -65,7 +65,6 @@
 #endif
 #if MG_CMSISPACK_NET == 0
 #define MG_ENABLE_TCPIP 1
-#define MG_ENABLE_DRIVER_STM32 1
 #elif MG_CMSISPACK_NET == 1
 #define MG_ENABLE_LWIP 1
 #elif MG_CMSISPACK_NET == 2
@@ -76,3 +75,4 @@
 
 
 // Add your customization below this comment
+#define MG_ENABLE_DRIVER_STM32 1
diff --git a/examples/stm32/nucleo-f746zg-keil-freertos_cmsis2-lwip/mongoose_custom.h b/examples/stm32/nucleo-f746zg-keil-freertos_cmsis2-lwip/mongoose_custom.h
index b3b39123..eb12e4be 100644
--- a/examples/stm32/nucleo-f746zg-keil-freertos_cmsis2-lwip/mongoose_custom.h
+++ b/examples/stm32/nucleo-f746zg-keil-freertos_cmsis2-lwip/mongoose_custom.h
@@ -65,7 +65,6 @@
 #endif
 #if MG_CMSISPACK_NET == 0
 #define MG_ENABLE_TCPIP 1
-#define MG_ENABLE_DRIVER_STM32 1
 #elif MG_CMSISPACK_NET == 1
 #define MG_ENABLE_LWIP 1
 #elif MG_CMSISPACK_NET == 2
@@ -76,3 +75,4 @@
 
 
 // Add your customization below this comment
+#define MG_ENABLE_DRIVER_STM32 1
diff --git a/examples/stm32/nucleo-f746zg-keil-freertos_cmsis2/mongoose_custom.h b/examples/stm32/nucleo-f746zg-keil-freertos_cmsis2/mongoose_custom.h
index 6b538531..5307c6bd 100644
--- a/examples/stm32/nucleo-f746zg-keil-freertos_cmsis2/mongoose_custom.h
+++ b/examples/stm32/nucleo-f746zg-keil-freertos_cmsis2/mongoose_custom.h
@@ -65,7 +65,6 @@
 #endif
 #if MG_CMSISPACK_NET == 0
 #define MG_ENABLE_TCPIP 1
-#define MG_ENABLE_DRIVER_STM32 1
 #elif MG_CMSISPACK_NET == 1
 #define MG_ENABLE_LWIP 1
 #elif MG_CMSISPACK_NET == 2
@@ -76,3 +75,4 @@
 
 
 // Add your customization below this comment
+#define MG_ENABLE_DRIVER_STM32 1
diff --git a/examples/stm32/nucleo-f746zg-keil-rtx-mdk/mongoose_custom.h b/examples/stm32/nucleo-f746zg-keil-rtx-mdk/mongoose_custom.h
index a6e40a6c..2fddc3ba 100644
--- a/examples/stm32/nucleo-f746zg-keil-rtx-mdk/mongoose_custom.h
+++ b/examples/stm32/nucleo-f746zg-keil-rtx-mdk/mongoose_custom.h
@@ -65,7 +65,6 @@
 #endif
 #if MG_CMSISPACK_NET == 0
 #define MG_ENABLE_TCPIP 1
-#define MG_ENABLE_DRIVER_STM32 1
 #elif MG_CMSISPACK_NET == 1
 #define MG_ENABLE_LWIP 1
 #elif MG_CMSISPACK_NET == 2
@@ -76,3 +75,4 @@
 
 
 // Add your customization below this comment
+#define MG_ENABLE_DRIVER_STM32 1
diff --git a/examples/stm32/nucleo-f746zg-keil-rtx/mongoose_custom.h b/examples/stm32/nucleo-f746zg-keil-rtx/mongoose_custom.h
index 20f79564..8ee2b06c 100644
--- a/examples/stm32/nucleo-f746zg-keil-rtx/mongoose_custom.h
+++ b/examples/stm32/nucleo-f746zg-keil-rtx/mongoose_custom.h
@@ -65,7 +65,6 @@
 #endif
 #if MG_CMSISPACK_NET == 0
 #define MG_ENABLE_TCPIP 1
-#define MG_ENABLE_DRIVER_STM32 1
 #elif MG_CMSISPACK_NET == 1
 #define MG_ENABLE_LWIP 1
 #elif MG_CMSISPACK_NET == 2
@@ -76,3 +75,4 @@
 
 
 // Add your customization below this comment
+#define MG_ENABLE_DRIVER_STM32 1
diff --git a/examples/stm32/nucleo-f746zg-keil-rtx5-lwip/RTE/Network_Library/mongoose_custom.h b/examples/stm32/nucleo-f746zg-keil-rtx5-lwip/RTE/Network_Library/mongoose_custom.h
deleted file mode 100644
index a415a6d0..00000000
--- a/examples/stm32/nucleo-f746zg-keil-rtx5-lwip/RTE/Network_Library/mongoose_custom.h
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// <<< Use Configuration Wizard in Context Menu >>>
-
-// <o> System Architecture
-//   <0=> Bare metal
-//   <1=> FreeRTOS
-//   <2=> CMSIS-RTOS v1
-//   <3=> CMSIS-RTOS v2
-// <i> Select either bare metal operation or a supported RTOS
-// <i> "FreeRTOS" uses direct FreeRTOS calls
-// <i> "CMSIS-RTOS v1" supports only Keil RTX through API v1
-// <i> "CMSIS-RTOS v2" supports Keil RTX5 and FreeRTOS through API v2
-
-#define MG_CMSISPACK_ARCH 3
-
-
-// <h> Networking support
-// <o> Networking stack
-//   <0=> Built-in
-//   <1=> lwIP
-//   <2=> FreeRTOS-Plus-TCP
-//   <3=> MDK (RL)
-// <i> Select the networking stack to use with Mongoose Library
-// <i> The built-in stack can run on bare metal or over any RTOS
-// <i> "lwIP" requires using an RTOS and BSD socket mode
-// <i> "MDK" requires using CMSIS-RTOS1 (RTX + RL) or CMSIS-RTOS2 (MDK Plus or Pro), and BSD socket mode
-#define MG_CMSISPACK_NET 1
-
-// <q> Use Mbed-TLS
-// <i> Mongoose will use Mbed-TLS calls for TLS-related functionality
-#define MG_ENABLE_MBEDTLS 0
-// </h>
-
-
-// <c1> Enable custom mg_millis()
-// <i> Use a user-provided function to get uptime in milliseconds, otherwise Mongoose will default to using time(). Except for bare metal, Mongoose will use the time base for the configured architecture
-//#define MG_ENABLE_CUSTOM_MILLIS 1
-// </c>
-
-
-// <c1> Enable custom mg_rand()
-// <i> Use a user-provided function to generate random numbers, otherwise Mongoose will default to using rand()
-#define MG_ENABLE_CUSTOM_RANDOM 1
-// </c>
-
-
-// <h> Filesystem support
-// <q> Enable packed (embedded) filesystem
-#define MG_ENABLE_PACKED_FS 1
-// </h>
-
-
-// <<< end of configuration section >>>
-
-// Translate to Mongoose macros
-#if MG_CMSISPACK_ARCH == 1
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_FREERTOS
-#elif MG_CMSISPACK_ARCH == 2
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS1
-#elif MG_CMSISPACK_ARCH == 3
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS2
-#endif
-#if MG_CMSISPACK_NET == 0
-#define MG_ENABLE_TCPIP 1
-#elif MG_CMSISPACK_NET == 1
-#define MG_ENABLE_LWIP 1
-#elif MG_CMSISPACK_NET == 2
-#define MG_ENABLE_FREERTOS_TCP 1
-#elif MG_CMSISPACK_NET == 3
-#define MG_ENABLE_RL 1
-#endif
-
-
-// Add your customization below this comment
diff --git a/examples/stm32/nucleo-f746zg-keil-rtx5-lwip/mongoose_custom.h b/examples/stm32/nucleo-f746zg-keil-rtx5-lwip/mongoose_custom.h
index b3b39123..fe746ae8 100644
--- a/examples/stm32/nucleo-f746zg-keil-rtx5-lwip/mongoose_custom.h
+++ b/examples/stm32/nucleo-f746zg-keil-rtx5-lwip/mongoose_custom.h
@@ -76,3 +76,4 @@
 
 
 // Add your customization below this comment
+#define MG_ENABLE_DRIVER_STM32 1
diff --git a/examples/stm32/nucleo-f746zg-keil-rtx5-mdk/mongoose_custom.h b/examples/stm32/nucleo-f746zg-keil-rtx5-mdk/mongoose_custom.h
index 292eda1c..9221a987 100644
--- a/examples/stm32/nucleo-f746zg-keil-rtx5-mdk/mongoose_custom.h
+++ b/examples/stm32/nucleo-f746zg-keil-rtx5-mdk/mongoose_custom.h
@@ -65,7 +65,6 @@
 #endif
 #if MG_CMSISPACK_NET == 0
 #define MG_ENABLE_TCPIP 1
-#define MG_ENABLE_DRIVER_STM32 1
 #elif MG_CMSISPACK_NET == 1
 #define MG_ENABLE_LWIP 1
 #elif MG_CMSISPACK_NET == 2
@@ -76,3 +75,4 @@
 
 
 // Add your customization below this comment
+#define MG_ENABLE_DRIVER_STM32 1
diff --git a/examples/stm32/nucleo-f746zg-keil-rtx5/mongoose_custom.h b/examples/stm32/nucleo-f746zg-keil-rtx5/mongoose_custom.h
index 1ebd7fbd..87390584 100644
--- a/examples/stm32/nucleo-f746zg-keil-rtx5/mongoose_custom.h
+++ b/examples/stm32/nucleo-f746zg-keil-rtx5/mongoose_custom.h
@@ -76,3 +76,4 @@
 
 
 // Add your customization below this comment
+#define MG_ENABLE_DRIVER_STM32 1