diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c
index 37f0cb04b..fa308dfca 100644
--- a/wolfcrypt/benchmark/benchmark.c
+++ b/wolfcrypt/benchmark/benchmark.c
@@ -15000,7 +15000,11 @@ void bench_sphincsKeySign(byte level, byte optim)
 #elif defined(__WATCOMC__)
 
     #include <time.h>
-    WC_INLINE double current_time(int reset) { (void)reset; return ((double)clock())/CLOCKS_PER_SEC; }
+    WC_INLINE double current_time(int reset)
+    {
+        (void)reset;
+        return ((double)clock())/CLOCKS_PER_SEC;
+    }
 #else
 
     #include <time.h>
diff --git a/wolfssl/test.h b/wolfssl/test.h
index 5068c8150..fa84ab0e0 100644
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -1496,7 +1496,7 @@ static WC_INLINE void tcp_socket(SOCKET_T* sockfd, int udp, int sctp)
             err_sys_with_errno("setsockopt TCP_NODELAY failed\n");
     }
 #endif
-#endif  /* !defined(USE_WINDOWS_API) && !defined(__WATCOMC__) && !defined(__OS2__) */
+#endif  /* !defined(USE_WINDOWS_API) && !defined(__WATCOMC__) && ... */
 }
 
 #if defined(WOLFSSL_WOLFSENTRY_HOOKS) && defined(WOLFSENTRY_H)
diff --git a/wolfssl/wolfcrypt/ecc.h b/wolfssl/wolfcrypt/ecc.h
index b1a7fa4e5..04a7a66e9 100644
--- a/wolfssl/wolfcrypt/ecc.h
+++ b/wolfssl/wolfcrypt/ecc.h
@@ -287,7 +287,8 @@ typedef byte   ecc_oid_t;
 #endif
 
 
-#if !defined(WOLFSSL_ECC_CURVE_STATIC) && defined(USE_WINDOWS_API) && !defined(__WATCOMC__)
+#if !defined(WOLFSSL_ECC_CURVE_STATIC) && defined(USE_WINDOWS_API) && \
+        !defined(__WATCOMC__)
     /* MSC does something different with the pointers to the arrays than GCC,
      * and it causes the FIPS checksum to fail. In the case of windows builds,
      * store everything as arrays instead of pointers to strings. */
diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h
index 9c8483fec..b53c1586f 100644
--- a/wolfssl/wolfcrypt/wc_port.h
+++ b/wolfssl/wolfcrypt/wc_port.h
@@ -127,7 +127,7 @@
         #if defined(USE_WINDOWS_API)
             #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
             #include <windows.h>
-            #undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
+            #undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header */
             #ifndef WOLFSSL_USER_IO
                 #include <winsock2.h>
                 #include <ws2tcpip.h> /* required for InetPton */
@@ -139,7 +139,7 @@
         #if defined(USE_WINDOWS_API)
             #define _WINSOCKAPI_ /* block inclusion of winsock.h header file */
             #include <windows.h>
-            #undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
+            #undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header */
             #include <process.h>
             #ifndef WOLFSSL_USER_IO
                 #include <winsock2.h>
@@ -172,7 +172,7 @@
         #if !defined(WOLFSSL_SGX) && !defined(WOLFSSL_NOT_WINDOWS_API)
             #define _WINSOCKAPI_ /* block inclusion of winsock.h header file. */
             #include <windows.h>
-            #undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header file */
+            #undef _WINSOCKAPI_ /* undefine it for MINGW winsock2.h header */
             #ifndef WOLFSSL_USER_IO
                 #include <winsock2.h>
                 #include <ws2tcpip.h> /* required for InetPton */
diff --git a/wolfssl/wolfio.h b/wolfssl/wolfio.h
index 68252ce24..de45a18b5 100644
--- a/wolfssl/wolfio.h
+++ b/wolfssl/wolfio.h
@@ -895,10 +895,12 @@ WOLFSSL_API void wolfSSL_SetIOWriteFlags(WOLFSSL* ssl, int flags);
 
 #ifndef XINET_NTOP
     #if defined(__WATCOMC__)
-        #if defined(__OS2__) || defined(__NT__) && (NTDDI_VERSION >= NTDDI_VISTA)
+        #if defined(__OS2__) || defined(__NT__) && \
+                (NTDDI_VERSION >= NTDDI_VISTA)
             #define XINET_NTOP(a,b,c,d) inet_ntop((a),(b),(c),(d))
         #else
-            #define XINET_NTOP(a,b,c,d) strncpy((c),inet_ntoa(*(unsigned *)(b)),(d))
+            #define XINET_NTOP(a,b,c,d) \
+                strncpy((c),inet_ntoa(*(unsigned *)(b)),(d))
         #endif
     #elif defined(USE_WINDOWS_API) /* Windows-friendly definition */
         #define XINET_NTOP(a,b,c,d) InetNtop((a),(b),(c),(d))
@@ -908,7 +910,8 @@ WOLFSSL_API void wolfSSL_SetIOWriteFlags(WOLFSSL* ssl, int flags);
 #endif
 #ifndef XINET_PTON
     #if defined(__WATCOMC__)
-        #if defined(__OS2__) || defined(__NT__) && (NTDDI_VERSION >= NTDDI_VISTA)
+        #if defined(__OS2__) || defined(__NT__) && \
+                (NTDDI_VERSION >= NTDDI_VISTA)
             #define XINET_PTON(a,b,c)   inet_pton((a),(b),(c))
         #else
             #define XINET_PTON(a,b,c)   *(unsigned *)(c) = inet_addr((b))