diff --git a/src/io.c b/src/io.c
index c5fdcd815..195056665 100644
--- a/src/io.c
+++ b/src/io.c
@@ -83,7 +83,7 @@
         #endif
         #include <fcntl.h>
         #if !(defined(DEVKITPRO) || defined(HAVE_RTP_SYS) || defined(EBSNET)) \
-            || defined(WOLFSSL_PICOTCP)
+            && !(defined(WOLFSSL_PICOTCP))
             #include <sys/socket.h>
             #include <arpa/inet.h>
             #include <netinet/in.h>
diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h
index 2f72c4c65..1652fa2c5 100644
--- a/wolfssl/ssl.h
+++ b/wolfssl/ssl.h
@@ -923,7 +923,7 @@ WOLFSSL_API int wolfSSL_make_eap_keys(WOLFSSL*, void* key, unsigned int len,
         #ifdef __PPU
             #include <sys/types.h>
             #include <sys/socket.h>
-        #elif !defined(WOLFSSL_MDK_ARM) && !defined(WOLFSSL_IAR_ARM)
+        #elif !defined(WOLFSSL_MDK_ARM) && !defined(WOLFSSL_IAR_ARM) && !defined(WOLFSSL_PICOTCP)
             #include <sys/uio.h>
         #endif
         /* allow writev style writing */
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index 23c19486d..a3b6a6551 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -244,10 +244,13 @@
 #endif
 
 #ifdef WOLFSSL_PICOTCP
-    #define errno pico_err
+    #ifndef errno
+        #define errno pico_err
+    #endif
     #include "pico_defines.h"
     #include "pico_stack.h"
     #include "pico_constants.h"
+    #include "pico_protocol.h"
     #define CUSTOM_RAND_GENERATE pico_rand
 #endif