diff --git a/ctaocrypt/benchmark/benchmark.c b/ctaocrypt/benchmark/benchmark.c
index 61c066d61..74da7b424 100644
--- a/ctaocrypt/benchmark/benchmark.c
+++ b/ctaocrypt/benchmark/benchmark.c
@@ -21,7 +21,9 @@
 
 /* CTaoCrypt benchmark */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <string.h>
 #include <stdio.h>
diff --git a/ctaocrypt/src/aes.c b/ctaocrypt/src/aes.c
index bb533b537..b46e71bdf 100644
--- a/ctaocrypt/src/aes.c
+++ b/ctaocrypt/src/aes.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #ifndef NO_AES
 
diff --git a/ctaocrypt/src/arc4.c b/ctaocrypt/src/arc4.c
index 0924579bf..35122c4d1 100644
--- a/ctaocrypt/src/arc4.c
+++ b/ctaocrypt/src/arc4.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <cyassl/ctaocrypt/ctc_arc4.h>
 
diff --git a/ctaocrypt/src/asn.c b/ctaocrypt/src/asn.c
index 75782ed81..977c4a457 100644
--- a/ctaocrypt/src/asn.c
+++ b/ctaocrypt/src/asn.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #ifdef THREADX
     #include "os.h"           /* dc_rtc_api needs    */
diff --git a/ctaocrypt/src/coding.c b/ctaocrypt/src/coding.c
index 38854cfa9..4f55415c3 100644
--- a/ctaocrypt/src/coding.c
+++ b/ctaocrypt/src/coding.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <cyassl/ctaocrypt/ctc_coding.h>
 #include <cyassl/ctaocrypt/ctc_error.h>
diff --git a/ctaocrypt/src/ctc_asm.c b/ctaocrypt/src/ctc_asm.c
index 8e06cfb90..d19fc87ea 100644
--- a/ctaocrypt/src/ctc_asm.c
+++ b/ctaocrypt/src/ctc_asm.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 /*
  * Based on public domain TomsFastMath 0.10 by Tom St Denis, tomstdenis@iahu.ca,
diff --git a/ctaocrypt/src/ctc_misc.c b/ctaocrypt/src/ctc_misc.c
index 0c3bd6c32..26b44b6c3 100644
--- a/ctaocrypt/src/ctc_misc.c
+++ b/ctaocrypt/src/ctc_misc.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <cyassl/ctaocrypt/ctc_misc.h>
 
diff --git a/ctaocrypt/src/cyassl_memory.c b/ctaocrypt/src/cyassl_memory.c
index 260ef172e..c9ec98361 100644
--- a/ctaocrypt/src/cyassl_memory.c
+++ b/ctaocrypt/src/cyassl_memory.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 /* submitted by eof */
 
diff --git a/ctaocrypt/src/des3.c b/ctaocrypt/src/des3.c
index 10011e853..075edd440 100644
--- a/ctaocrypt/src/des3.c
+++ b/ctaocrypt/src/des3.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #ifndef NO_DES3
 
diff --git a/ctaocrypt/src/dh.c b/ctaocrypt/src/dh.c
index 31e6f446a..48892450a 100644
--- a/ctaocrypt/src/dh.c
+++ b/ctaocrypt/src/dh.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #ifndef NO_DH
 
diff --git a/ctaocrypt/src/dsa.c b/ctaocrypt/src/dsa.c
index 06aab4cd1..a76e2789b 100644
--- a/ctaocrypt/src/dsa.c
+++ b/ctaocrypt/src/dsa.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #ifndef NO_DSA
 
diff --git a/ctaocrypt/src/hc128.c b/ctaocrypt/src/hc128.c
index bd1172808..c1f5be550 100644
--- a/ctaocrypt/src/hc128.c
+++ b/ctaocrypt/src/hc128.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #if HAVE_HC128
 
diff --git a/ctaocrypt/src/hmac.c b/ctaocrypt/src/hmac.c
index ae1fc32d2..e22420bfd 100644
--- a/ctaocrypt/src/hmac.c
+++ b/ctaocrypt/src/hmac.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #ifndef NO_HMAC
 
diff --git a/ctaocrypt/src/integer.c b/ctaocrypt/src/integer.c
index a9381a050..55a3f5c51 100644
--- a/ctaocrypt/src/integer.c
+++ b/ctaocrypt/src/integer.c
@@ -26,7 +26,10 @@
  */
 
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
+
 /* in case user set USE_FAST_MATH there */
 #include <cyassl/ctaocrypt/ctc_settings.h>
 
diff --git a/ctaocrypt/src/logging.c b/ctaocrypt/src/logging.c
index 05ce6e1da..28f869b54 100644
--- a/ctaocrypt/src/logging.c
+++ b/ctaocrypt/src/logging.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 /* submitted by eof */
 
diff --git a/ctaocrypt/src/md4.c b/ctaocrypt/src/md4.c
index 46e1e9709..1f9672f20 100644
--- a/ctaocrypt/src/md4.c
+++ b/ctaocrypt/src/md4.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 
 #ifndef NO_MD4
diff --git a/ctaocrypt/src/md5.c b/ctaocrypt/src/md5.c
index 3642050d2..9ff0b445f 100644
--- a/ctaocrypt/src/md5.c
+++ b/ctaocrypt/src/md5.c
@@ -20,7 +20,9 @@
  */
 
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <cyassl/ctaocrypt/ctc_md5.h>
 
diff --git a/ctaocrypt/src/pwdbased.c b/ctaocrypt/src/pwdbased.c
index 4d94eb891..e5c2b780c 100644
--- a/ctaocrypt/src/pwdbased.c
+++ b/ctaocrypt/src/pwdbased.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #ifndef NO_PWDBASED
 
diff --git a/ctaocrypt/src/rabbit.c b/ctaocrypt/src/rabbit.c
index ddfbdb5c5..992780e4b 100644
--- a/ctaocrypt/src/rabbit.c
+++ b/ctaocrypt/src/rabbit.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #ifndef NO_RABBIT
 
diff --git a/ctaocrypt/src/random.c b/ctaocrypt/src/random.c
index 393d5c461..e4f50d5d4 100644
--- a/ctaocrypt/src/random.c
+++ b/ctaocrypt/src/random.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 /* on HPUX 11 you may need to install /dev/random see
    http://h20293.www2.hp.com/portal/swdepot/displayProductInfo.do?productNumber=KRNG11I
diff --git a/ctaocrypt/src/ripemd.c b/ctaocrypt/src/ripemd.c
index fdfaf19d9..565c8bd19 100644
--- a/ctaocrypt/src/ripemd.c
+++ b/ctaocrypt/src/ripemd.c
@@ -20,7 +20,9 @@
  */
 
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #ifdef CYASSL_RIPEMD
 
diff --git a/ctaocrypt/src/rsa.c b/ctaocrypt/src/rsa.c
index 37b970bfb..f4107e7f0 100644
--- a/ctaocrypt/src/rsa.c
+++ b/ctaocrypt/src/rsa.c
@@ -20,7 +20,9 @@
  */
 
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <cyassl/ctaocrypt/ctc_rsa.h>
 #include <cyassl/ctaocrypt/ctc_random.h>
diff --git a/ctaocrypt/src/sha.c b/ctaocrypt/src/sha.c
index 993eb45b8..6bdfe0e1e 100644
--- a/ctaocrypt/src/sha.c
+++ b/ctaocrypt/src/sha.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <cyassl/ctaocrypt/ctc_sha.h>
 #ifdef NO_INLINE
diff --git a/ctaocrypt/src/sha256.c b/ctaocrypt/src/sha256.c
index 69ec0f044..7d3a5fce0 100644
--- a/ctaocrypt/src/sha256.c
+++ b/ctaocrypt/src/sha256.c
@@ -22,7 +22,9 @@
 
 /* code submitted by raphael.huck@efixo.com */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #ifndef NO_SHA256
 
diff --git a/ctaocrypt/src/sha512.c b/ctaocrypt/src/sha512.c
index 8f95592a4..d5ebde2b2 100644
--- a/ctaocrypt/src/sha512.c
+++ b/ctaocrypt/src/sha512.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 
 #ifdef CYASSL_SHA512
diff --git a/ctaocrypt/src/tfm.c b/ctaocrypt/src/tfm.c
index 321a4e64b..fc5e0470f 100644
--- a/ctaocrypt/src/tfm.c
+++ b/ctaocrypt/src/tfm.c
@@ -30,7 +30,9 @@
  *  to fit CyaSSL's needs.
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 /* in case user set USE_FAST_MATH there */
 #include <cyassl/ctaocrypt/ctc_settings.h>
diff --git a/examples/client/client.c b/examples/client/client.c
index 4a5ae2ee0..2f7c5c15c 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <cyassl/openssl/ssl.h>
 #include <cyassl/openssl/cyassl_test.h>
diff --git a/examples/echoclient/echoclient.c b/examples/echoclient/echoclient.c
index ac6e7699e..29a0809ef 100644
--- a/examples/echoclient/echoclient.c
+++ b/examples/echoclient/echoclient.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <cyassl/openssl/ssl.h>
 #include <cyassl/openssl/cyassl_test.h>
diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c
index c8528d88f..ed7cc5621 100644
--- a/examples/echoserver/echoserver.c
+++ b/examples/echoserver/echoserver.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <cyassl/openssl/ssl.h>
 #include <cyassl/openssl/cyassl_test.h>
diff --git a/examples/server/server.c b/examples/server/server.c
index c8c4a39f0..bfeb41401 100644
--- a/examples/server/server.c
+++ b/examples/server/server.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <cyassl/openssl/ssl.h>
 #include <cyassl/openssl/cyassl_test.h>
diff --git a/src/cyassl_int.c b/src/cyassl_int.c
index de807e05c..7d01448e1 100644
--- a/src/cyassl_int.c
+++ b/src/cyassl_int.c
@@ -20,7 +20,9 @@
  */
 
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <cyassl/cyassl_int.h>
 #include <cyassl/cyassl_error.h>
diff --git a/src/cyassl_io.c b/src/cyassl_io.c
index bc4a26cc7..2cfc4a8b1 100644
--- a/src/cyassl_io.c
+++ b/src/cyassl_io.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #ifdef _WIN32_WCE
     /* On WinCE winsock2.h must be included before windows.h for socket stuff */
diff --git a/src/keys.c b/src/keys.c
index a34bf75e2..2e9ba3d4c 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -20,7 +20,9 @@
  */
 
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <cyassl/cyassl_int.h>
 #include <cyassl/cyassl_error.h>
diff --git a/src/sniffer.c b/src/sniffer.c
index bddfc02ce..c99decf1a 100644
--- a/src/sniffer.c
+++ b/src/sniffer.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <assert.h>
 #include <time.h>
diff --git a/src/ssl.c b/src/ssl.c
index 6d7bc1979..20727ee68 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #ifdef HAVE_ERRNO_H 
     #include <errno.h>
diff --git a/src/tls.c b/src/tls.c
index a2f71d92f..fbc09999c 100644
--- a/src/tls.c
+++ b/src/tls.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <cyassl/openssl/ssl.h>
 #include <cyassl/cyassl_int.h>
diff --git a/sslSniffer/sslSnifferTest/snifftest.c b/sslSniffer/sslSnifferTest/snifftest.c
index ffa9f9ee7..ab5e340e1 100755
--- a/sslSniffer/sslSnifferTest/snifftest.c
+++ b/sslSniffer/sslSnifferTest/snifftest.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #ifdef _WIN32
     #define CYASSL_SNIFFER
diff --git a/swig/cyassl_adds.c b/swig/cyassl_adds.c
index c1d4660f0..18d8085e4 100644
--- a/swig/cyassl_adds.c
+++ b/swig/cyassl_adds.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #ifndef _WIN32
     #define HAVE_CONFIG_H
diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c
index c3f051143..2d39edafd 100644
--- a/testsuite/testsuite.c
+++ b/testsuite/testsuite.c
@@ -19,7 +19,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
 
 #include <cyassl/openssl/ssl.h>
 #include <cyassl/openssl/cyassl_test.h>