diff --git a/wolfssl/wolfcrypt/visibility.h b/wolfssl/wolfcrypt/visibility.h
index b93e6859c..36332f31d 100644
--- a/wolfssl/wolfcrypt/visibility.h
+++ b/wolfssl/wolfcrypt/visibility.h
@@ -77,5 +77,11 @@
 #endif /* BUILDING_WOLFSSL */
 
 #endif /* HAVE_FIPS */
+
+/* WOLFSSL_ABI is used for public API symbols that must not change
+ * their signature.
+ */
+#define WOLFSSL_ABI
+
 #endif /* WOLF_CRYPT_VISIBILITY_H */
 
diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h
index 2c8185c80..51ed220ea 100644
--- a/wolfssl/wolfcrypt/wc_port.h
+++ b/wolfssl/wolfcrypt/wc_port.h
@@ -358,9 +358,6 @@ WOLFSSL_API int wc_LockMutex_ex(int flag, int type, const char* file, int line);
 WOLFSSL_API int wc_SetMutexCb(mutex_cb* cb);
 #endif
 
-#define WOLFSSL_ABI
-    /* TODO: Fix this. The above is a hack for now - UP */
-
 /* main crypto initialization function */
 WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Init(void);
 WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);