diff --git a/.gitignore b/.gitignore
index 2290bfecb..85835d133 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,15 +17,18 @@ depcomp
 missing
 libtool
 tags
-benchmark
-test
-client
-echoclient
-echoserver
-server
+ctaocrypt/benchmark/benchmark
+ctaocrypt/test
+examples/client/client
+examples/echoclient/echoclient
+examples/echoserver/echoserver
+examples/server/server
 snifftest
 output
-testsuite
+testsuite/testsuite
+testsuite/*.der
+testsuite/*.pem
+testsuite/*.raw
 diff
 sslSniffer/sslSnifferTest/tracefile.txt
 *.gz
diff --git a/configure.in b/configure.in
index 2d912dcab..5b61fd1d7 100644
--- a/configure.in
+++ b/configure.in
@@ -444,7 +444,7 @@ GCCWARNINGS="-Wall -fno-strict-aliasing -W -Wfloat-equal -Wundef       \
 -Wmissing-field-initializers -Wdeclaration-after-statement              \
 -Wold-style-definition -Waddress -Wmissing-noreturn -Wnormalized=id     \
 -Woverride-init -Wstrict-overflow=1 -Wextra -Warray-bounds              \
--Wstack-protector -Wformat -Wformat-security -Wpointer-sign"
+-Wstack-protector -Wformat -Wformat-security -Wpointer-sign -Wshadow"
 
 AC_ARG_ENABLE(gcc-lots-o-warnings,
 AS_HELP_STRING(--enable-gcc-lots-o-warnings, enable lots of gcc warnings),
diff --git a/ctaocrypt/include/os_settings.h b/ctaocrypt/include/os_settings.h
index f32af4c84..5db1b6dcd 100644
--- a/ctaocrypt/include/os_settings.h
+++ b/ctaocrypt/include/os_settings.h
@@ -79,12 +79,6 @@
     #define NO_DH
     #define NO_DSA
     #define NO_HC128
-    #define CYASSL_LWIP      /* by default for now */
-#endif
-
-#ifdef CYASSL_LWIP
-    #define LWIP_SOCKETS
-    #define LWIP_PROVIDE_ERRNO
 #endif
 
 #ifdef MICRIUM
diff --git a/src/cyassl_io.c b/src/cyassl_io.c
index 739b99e3f..2f88af902 100644
--- a/src/cyassl_io.c
+++ b/src/cyassl_io.c
@@ -38,9 +38,10 @@
 #endif
 
 #ifndef USE_WINDOWS_API
-    #ifdef LWIP_SOCKETS
-        #define LWIP_SOCKET 1              /* use berkely API */
-        #define LWIP_COMPAT_SOCKETS 1
+    #ifdef CYASSL_LWIP
+        /* lwIP needs to be configured to use sockets API in this mode */
+        /* LWIP_SOCKET 1 && LWIP_COMPAT_SOCKETS 1 in lwip/opt.h or in build */
+        #define LWIP_PROVIDE_ERRNO 1
         #include "sockets.h"
     #else
         #include <sys/types.h>