diff --git a/mongoose.h b/mongoose.h
index 47392d57ae..6e2ae9abcb 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -522,7 +522,7 @@ typedef int socklen_t;
 
 #include <ctype.h>
 #include <errno.h>
-#include <fcntl.h>
+#include <zephyr/posix/fcntl.h>
 #include <zephyr/net/socket.h>
 #include <stdarg.h>
 #include <stdbool.h>
@@ -3080,6 +3080,14 @@ struct mg_tcpip_driver_tm4c_data {
 
 #endif
 
+
+#if MG_ENABLE_TCPIP && defined(MG_ENABLE_DRIVER_W5500) && MG_ENABLE_DRIVER_W5500
+
+#undef MG_ENABLE_TCPIP_DRIVER_INIT
+#define MG_ENABLE_TCPIP_DRIVER_INIT 0
+
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/arch_zephyr.h b/src/arch_zephyr.h
index 23981287ac..dc020319b4 100644
--- a/src/arch_zephyr.h
+++ b/src/arch_zephyr.h
@@ -6,7 +6,7 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <fcntl.h>
+#include <zephyr/posix/fcntl.h>
 #include <zephyr/net/socket.h>
 #include <stdarg.h>
 #include <stdbool.h>