diff --git a/examples/client/client.c b/examples/client/client.c
index 275c92f95..c96c0f93f 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -150,6 +150,8 @@ static void ShowVersions(void)
     printf("3\n");
 }
 
+extern double current_time(void);
+
 int ClientBenchmarkConnections(WOLFSSL_CTX* ctx, char* host, word16 port,
     int doDTLS, int benchmark, int resumeSession)
 {
diff --git a/examples/server/server.c b/examples/server/server.c
index 65845dd0a..73c90cc31 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -125,6 +125,8 @@ static int NonBlockingSSL_Accept(SSL* ssl)
     return ret;
 }
 
+extern double current_time(void);
+
 /* Echo number of bytes specified by -e arg */
 int ServerEchoData(SSL* ssl, int clientfd, int echoData, int throughput)
 {
diff --git a/src/ssl.c b/src/ssl.c
index f916c185c..6e9b8b45a 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -15257,16 +15257,12 @@ int wolfSSL_EC_GROUP_get_degree(const WOLFSSL_EC_GROUP *group)
     switch(group->curve_nid) {
         case NID_X9_62_prime256v1:
             return 256;
-            break;
         case NID_secp384r1:
             return 384;
-            break;
         case NID_secp521r1:
             return 521;
-            break;
         default :
             return SSL_FAILURE;
-            break;
     }
 }
 
diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index 6930ed96c..ad3e408b7 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -2080,7 +2080,7 @@ int poly1305_test(void)
     byte     tag[16];
     Poly1305 enc;
 
-    const byte msg[] =
+    static const byte msg[] =
     {
         0x43,0x72,0x79,0x70,0x74,0x6f,0x67,0x72,
         0x61,0x70,0x68,0x69,0x63,0x20,0x46,0x6f,
@@ -2089,13 +2089,13 @@ int poly1305_test(void)
         0x75,0x70
     };
 
-    const byte msg2[] =
+    static const byte msg2[] =
     {
         0x48,0x65,0x6c,0x6c,0x6f,0x20,0x77,0x6f,0x72,
         0x6c,0x64,0x21
     };
 
-    const byte msg3[] =
+    static const byte msg3[] =
     {
         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -2103,7 +2103,7 @@ int poly1305_test(void)
         0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
     };
 
-    const byte msg4[] =
+    static const byte msg4[] =
     {
         0xd3,0x1a,0x8d,0x34,0x64,0x8e,0x60,0xdb,
         0x7b,0x86,0xaf,0xbc,0x53,0xef,0x7e,0xc2,
@@ -2128,46 +2128,46 @@ int poly1305_test(void)
         0xc4,0xc5,0xc6,0xc7
     };
 
-    const byte correct[] =
+    static const byte correct[] =
     {
         0xa8,0x06,0x1d,0xc1,0x30,0x51,0x36,0xc6,
         0xc2,0x2b,0x8b,0xaf,0x0c,0x01,0x27,0xa9
 
     };
 
-    const byte correct2[] =
+    static const byte correct2[] =
     {
         0xa6,0xf7,0x45,0x00,0x8f,0x81,0xc9,0x16,
         0xa2,0x0d,0xcc,0x74,0xee,0xf2,0xb2,0xf0
     };
 
-    const byte correct3[] =
+    static const byte correct3[] =
     {
         0x49,0xec,0x78,0x09,0x0e,0x48,0x1e,0xc6,
         0xc2,0x6b,0x33,0xb9,0x1c,0xcc,0x03,0x07
     };
 
-    const byte correct4[] =
+    static const byte correct4[] =
     {
         0x1a,0xe1,0x0b,0x59,0x4f,0x09,0xe2,0x6a,
         0x7e,0x90,0x2e,0xcb,0xd0,0x60,0x06,0x91
     };
 
-    const byte key[] = {
+    static const byte key[] = {
         0x85,0xd6,0xbe,0x78,0x57,0x55,0x6d,0x33,
         0x7f,0x44,0x52,0xfe,0x42,0xd5,0x06,0xa8,
         0x01,0x03,0x80,0x8a,0xfb,0x0d,0xb2,0xfd,
         0x4a,0xbf,0xf6,0xaf,0x41,0x49,0xf5,0x1b
     };
 
-    const byte key2[] = {
+    static const byte key2[] = {
         0x74,0x68,0x69,0x73,0x20,0x69,0x73,0x20,
         0x33,0x32,0x2d,0x62,0x79,0x74,0x65,0x20,
         0x6b,0x65,0x79,0x20,0x66,0x6f,0x72,0x20,
         0x50,0x6f,0x6c,0x79,0x31,0x33,0x30,0x35
     };
 
-    const byte key4[] = {
+    static const byte key4[] = {
         0x7b,0xac,0x2b,0x25,0x2d,0xb4,0x47,0xaf,
         0x09,0xb6,0x7a,0x55,0xa4,0xe9,0x55,0x84,
         0x0a,0xe1,0xd6,0x73,0x10,0x75,0xd9,0xeb,