diff --git a/ctaocrypt/src/asn.c b/ctaocrypt/src/asn.c
index c9e399f20..a65e42ef9 100644
--- a/ctaocrypt/src/asn.c
+++ b/ctaocrypt/src/asn.c
@@ -2078,7 +2078,13 @@ static void IsCa(DecodedCert* cert)
 
 
 /* from SSL proper, for locking can't do find here anymore */
-CYASSL_LOCAL Signer* GetCA(Signer* signers, byte* hash);
+#ifdef __cplusplus
+    extern "C" {
+#endif
+    CYASSL_LOCAL Signer* GetCA(Signer* signers, byte* hash);
+#ifdef __cplusplus
+    } 
+#endif
 
 
 int ParseCertRelative(DecodedCert* cert, int type, int verify,
diff --git a/ctaocrypt/src/logging.c b/ctaocrypt/src/logging.c
index 0b7b9bec1..584d1dda9 100644
--- a/ctaocrypt/src/logging.c
+++ b/ctaocrypt/src/logging.c
@@ -30,8 +30,15 @@
 #include <cyassl/ctaocrypt/error.h>
 
 
-CYASSL_API int  CyaSSL_Debugging_ON(void);
-CYASSL_API void CyaSSL_Debugging_OFF(void);
+#ifdef __cplusplus
+    extern "C" {
+#endif
+    CYASSL_API int  CyaSSL_Debugging_ON(void);
+    CYASSL_API void CyaSSL_Debugging_OFF(void);
+#ifdef __cplusplus
+    } 
+#endif
+
 
 #ifdef DEBUG_CYASSL
 
diff --git a/cyassl/test.h b/cyassl/test.h
index 360ddb7ab..fbc0852c4 100644
--- a/cyassl/test.h
+++ b/cyassl/test.h
@@ -117,8 +117,8 @@ typedef struct tcp_ready {
 } tcp_ready;    
 
 
-void InitTcpReady();
-void FreeTcpReady();
+void InitTcpReady(tcp_ready*);
+void FreeTcpReady(tcp_ready*);
 
 
 typedef struct func_args {