diff --git a/examples/client/client.c b/examples/client/client.c
index 08d093db9..c01d5b6f2 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -102,9 +102,7 @@ static int NonBlockingSSL_Connect(WOLFSSL* ssl)
     while (ret != WOLFSSL_SUCCESS && (error == WOLFSSL_ERROR_WANT_READ ||
                                   error == WOLFSSL_ERROR_WANT_WRITE ||
                                   error == WC_PENDING_E)) {
-    #ifdef WOLFSSL_DTLS
         int currTimeout = 1;
-    #endif
                                                                         
         if (error == WOLFSSL_ERROR_WANT_READ)
             printf("... client would read block\n");
diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c
index d4cfcf354..21f51469c 100644
--- a/examples/echoclient/echoclient.c
+++ b/examples/echoclient/echoclient.c
@@ -35,21 +35,12 @@
 #if defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET)
         #include <stdio.h>
         #include <string.h>
-
-        #if !defined(WOLFSSL_MDK_ARM)
-            #include "cmsis_os.h"
-            #include "rl_net.h"
-        #else
-            #include "rtl.h"
-            #include "wolfssl_MDK_ARM.h"
-        #endif
-        #if defined(WOLFSSL_MDK_SHELL)
-            char * wolfssl_fgets ( char * str, int num, FILE * f ) ;
-            #define fgets wolfssl_fgets
-        #endif
+        #include "cmsis_os.h"
+        #include "rl_fs.h"
+        #include "rl_net.h"
+        #include "wolfssl_MDK_ARM.h"
 #endif
 
-
 #include <cyassl/test.h>
 
 #include <examples/echoclient/echoclient.h>
diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c
index 5bcb2014e..4968c945d 100644
--- a/examples/echoserver/echoserver.c
+++ b/examples/echoserver/echoserver.c
@@ -33,15 +33,10 @@
 #if defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET)
         #include <stdio.h>
         #include <string.h>
-
-        #if !defined(WOLFSSL_MDK_ARM)
-            #include "cmsis_os.h"
-            #include "rl_fs.h"
-            #include "rl_net.h"
-        #else
-            #include "rtl.h"
-            #include "wolfssl_MDK_ARM.h"
-        #endif
+        #include "cmsis_os.h"
+        #include "rl_fs.h"
+        #include "rl_net.h"
+        #include "wolfssl_MDK_ARM.h"
 #endif
 
 #include <cyassl/ssl.h>
diff --git a/examples/server/server.c b/examples/server/server.c
index 60a5e442d..058e4dc32 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -33,18 +33,12 @@
 #if defined(WOLFSSL_MDK_ARM) || defined(WOLFSSL_KEIL_TCP_NET)
         #include <stdio.h>
         #include <string.h>
-
-        #if  !defined(WOLFSSL_MDK_ARM)
-            #include "cmsis_os.h"
-            #include "rl_fs.h"
-            #include "rl_net.h"
-        #else
-            #include "rtl.h"
-            #include "wolfssl_MDK_ARM.h"
-        #endif
-
-
+        #include "cmsis_os.h"
+        #include "rl_fs.h"
+        #include "rl_net.h"
+        #include "wolfssl_MDK_ARM.h"
 #endif
+
 #include <cyassl/openssl/ssl.h>
 #include <cyassl/test.h>
 #ifdef CYASSL_DTLS