diff --git a/wolfcrypt/src/memory.c b/wolfcrypt/src/memory.c
index 865971750..2bf31405b 100644
--- a/wolfcrypt/src/memory.c
+++ b/wolfcrypt/src/memory.c
@@ -101,7 +101,11 @@ void* wolfSSL_Malloc(size_t size)
     #endif
     }
     else {
+    #ifndef WOLFSSL_NO_MALLOC
         res = malloc(size);
+    #else
+        WOLFSSL_MSG("No malloc available");
+    #endif
     }
 
     #ifdef WOLFSSL_MALLOC_CHECK
@@ -126,7 +130,11 @@ void wolfSSL_Free(void *ptr)
     #endif
     }
     else {
+    #ifndef WOLFSSL_NO_MALLOC
         free(ptr);
+    #else
+        WOLFSSL_MSG("No free available");
+    #endif
     }
 }
 
diff --git a/wolfssl/wolfio.h b/wolfssl/wolfio.h
index d393c44d1..d4b8afc75 100644
--- a/wolfssl/wolfio.h
+++ b/wolfssl/wolfio.h
@@ -53,8 +53,8 @@
         /* lwIP needs to be configured to use sockets API in this mode */
         /* LWIP_SOCKET 1 in lwip/opt.h or in build */
         #include "lwip/sockets.h"
-        #include <errno.h>
         #ifndef LWIP_PROVIDE_ERRNO
+            #include <errno.h>
             #define LWIP_PROVIDE_ERRNO 1
         #endif
     #elif defined(FREESCALE_MQX)