diff --git a/src/io.c b/src/io.c
index d16e96f3c..f53e4e25b 100644
--- a/src/io.c
+++ b/src/io.c
@@ -124,6 +124,14 @@
     #define SOCKET_EPIPE       EPIPE
     #define SOCKET_ECONNREFUSED RTCSERR_TCP_CONN_REFUSED
     #define SOCKET_ECONNABORTED RTCSERR_TCP_CONN_ABORTED
+#elif defined(CYASSL_MDK_ARM)
+    #define SOCKET_EWOULDBLOCK SCK_EWOULDBLOCK
+    #define SOCKET_EAGAIN      SCK_ELOCKED
+    #define SOCKET_ECONNRESET  SCK_ECLOSED
+    #define SOCKET_EINTR       SCK_ERROR
+    #define SOCKET_EPIPE       SCK_ERROR
+    #define SOCKET_ECONNREFUSED SCK_ERROR
+    #define SOCKET_ECONNABORTED SCK_ERROR
 #else
     #define SOCKET_EWOULDBLOCK EWOULDBLOCK
     #define SOCKET_EAGAIN      EAGAIN
diff --git a/src/ssl.c b/src/ssl.c
index bec7080eb..d208c7be8 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -5315,9 +5315,7 @@ int CyaSSL_set_compression(CYASSL* ssl)
     }
 
 
-#ifdef USE_WINDOWS_API
-    #define CloseSocket(s) closesocket(s)
-#elif defined(CYASSL_MDK_ARM)
+#ifdef USE_WINDOWS_API 
     #define CloseSocket(s) closesocket(s)
 #else
     #define CloseSocket(s) close(s)