diff --git a/wolfssl/openssl/evp.h b/wolfssl/openssl/evp.h
index fbfea201a1..43b1425873 100644
--- a/wolfssl/openssl/evp.h
+++ b/wolfssl/openssl/evp.h
@@ -1230,10 +1230,10 @@ WOLFSSL_API int wolfSSL_EVP_SignInit_ex(WOLFSSL_EVP_MD_CTX* ctx,
 #endif
 
 
-#define EVP_R_BAD_DECRYPT               (-MIN_CODE_E + 100 + 1)
-#define EVP_R_BN_DECODE_ERROR           (-MIN_CODE_E + 100 + 2)
-#define EVP_R_DECODE_ERROR              (-MIN_CODE_E + 100 + 3)
-#define EVP_R_PRIVATE_KEY_DECODE_ERROR  (-MIN_CODE_E + 100 + 4)
+#define EVP_R_BAD_DECRYPT               (-(MIN_CODE_E) + 100 + 1)
+#define EVP_R_BN_DECODE_ERROR           (-(MIN_CODE_E) + 100 + 2)
+#define EVP_R_DECODE_ERROR              (-(MIN_CODE_E) + 100 + 3)
+#define EVP_R_PRIVATE_KEY_DECODE_ERROR  (-(MIN_CODE_E) + 100 + 4)
 
 #define EVP_PKEY_NONE                   NID_undef
 #define EVP_PKEY_DH                     28
diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h
index 1a99437568..b4d1a150f1 100644
--- a/wolfssl/openssl/ssl.h
+++ b/wolfssl/openssl/ssl.h
@@ -1542,11 +1542,11 @@ typedef WOLFSSL_SRTP_PROTECTION_PROFILE      SRTP_PROTECTION_PROFILE;
 #define PEM_F_PEM_DEF_CALLBACK  100
 
 /* Avoid wolfSSL error code range */
-#define PEM_R_NO_START_LINE             (-MIN_CODE_E + 1)
-#define PEM_R_PROBLEMS_GETTING_PASSWORD (-MIN_CODE_E + 2)
-#define PEM_R_BAD_PASSWORD_READ         (-MIN_CODE_E + 3)
-#define PEM_R_BAD_DECRYPT               (-MIN_CODE_E + 4)
-#define ASN1_R_HEADER_TOO_LONG          (-MIN_CODE_E + 5)
+#define PEM_R_NO_START_LINE             (-(MIN_CODE_E) + 1)
+#define PEM_R_PROBLEMS_GETTING_PASSWORD (-(MIN_CODE_E) + 2)
+#define PEM_R_BAD_PASSWORD_READ         (-(MIN_CODE_E) + 3)
+#define PEM_R_BAD_DECRYPT               (-(MIN_CODE_E) + 4)
+#define ASN1_R_HEADER_TOO_LONG          (-(MIN_CODE_E) + 5)
 
 #define ERR_LIB_SYS             2
 #define ERR_LIB_RSA             4