diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c
index 2c506b575..2e6504e61 100644
--- a/wolfcrypt/src/aes.c
+++ b/wolfcrypt/src/aes.c
@@ -3887,10 +3887,4 @@ static int AesCaviumCbcDecrypt(Aes* aes, byte* out, const byte* in,
 
 #endif /* HAVE_FIPS */
 
-#ifdef __cplusplus
-    } /* extern "C" */
-#endif
-
-
 #endif /* NO_AES */
-
diff --git a/wolfssl/wolfcrypt/memory.h b/wolfssl/wolfcrypt/memory.h
index 81250160d..3968b3527 100644
--- a/wolfssl/wolfcrypt/memory.h
+++ b/wolfssl/wolfcrypt/memory.h
@@ -28,6 +28,10 @@
 #include <stdlib.h>
 #include <wolfssl/wolfcrypt/types.h>
 
+#ifdef __cplusplus
+    extern "C" {
+#endif
+
 typedef void *(*wolfSSL_Malloc_cb)(size_t size);
 typedef void (*wolfSSL_Free_cb)(void *ptr);
 typedef void *(*wolfSSL_Realloc_cb)(void *ptr, size_t size);
@@ -43,5 +47,10 @@ WOLFSSL_API void* wolfSSL_Malloc(size_t size);
 WOLFSSL_API void  wolfSSL_Free(void *ptr);
 WOLFSSL_API void* wolfSSL_Realloc(void *ptr, size_t size);
 
+
+#ifdef __cplusplus
+    }  /* extern "C" */
+#endif
+
 #endif /* WOLFSSL_MEMORY_H */