diff --git a/configure.in b/configure.in
index 5b61fd1d7..1d4cd61a9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(cyassl,2.0.0rc1b,http://www.yassl.com)    # !!! also change in ssl.h !!!
 AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER(ctaocrypt/include/config.h)
+AM_CONFIG_HEADER(ctaocrypt/include/ctc_config.h)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_SYSTEM
 
diff --git a/ctaocrypt/include/ctc_dh.h b/ctaocrypt/include/ctc_dh.h
index 4329a3855..c35c23b87 100644
--- a/ctaocrypt/include/ctc_dh.h
+++ b/ctaocrypt/include/ctc_dh.h
@@ -26,7 +26,7 @@
 
 #include "types.h"
 #include "integer.h"
-#include "random.h"
+#include "ctc_random.h"
 
 #ifdef __cplusplus
     extern "C" {
diff --git a/ctaocrypt/include/ctc_dsa.h b/ctaocrypt/include/ctc_dsa.h
index 1dbcb77fe..6d542bf29 100644
--- a/ctaocrypt/include/ctc_dsa.h
+++ b/ctaocrypt/include/ctc_dsa.h
@@ -26,7 +26,7 @@
 
 #include "types.h"
 #include "integer.h"
-#include "random.h"
+#include "ctc_random.h"
 
 #ifdef __cplusplus
     extern "C" {
diff --git a/ctaocrypt/include/ctc_ecc.h b/ctaocrypt/include/ctc_ecc.h
index 6b71f3567..b68421be2 100644
--- a/ctaocrypt/include/ctc_ecc.h
+++ b/ctaocrypt/include/ctc_ecc.h
@@ -26,7 +26,7 @@
 
 #include "types.h"
 #include "integer.h"
-#include "random.h"
+#include "ctc_random.h"
 
 #ifdef __cplusplus
     extern "C" {
diff --git a/ctaocrypt/include/random.h b/ctaocrypt/include/ctc_random.h
similarity index 99%
rename from ctaocrypt/include/random.h
rename to ctaocrypt/include/ctc_random.h
index d21712180..2f77d223e 100644
--- a/ctaocrypt/include/random.h
+++ b/ctaocrypt/include/ctc_random.h
@@ -1,4 +1,4 @@
-/* random.h
+/* ctc_random.h
  *
  * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
  *
diff --git a/ctaocrypt/include/ctc_rsa.h b/ctaocrypt/include/ctc_rsa.h
index fe6a6de97..2ce59b7d5 100644
--- a/ctaocrypt/include/ctc_rsa.h
+++ b/ctaocrypt/include/ctc_rsa.h
@@ -25,7 +25,7 @@
 
 #include "types.h"
 #include "integer.h"
-#include "random.h"
+#include "ctc_random.h"
 
 #ifdef __cplusplus
     extern "C" {
diff --git a/ctaocrypt/include/os_settings.h b/ctaocrypt/include/os_settings.h
index 5db1b6dcd..0660272ca 100644
--- a/ctaocrypt/include/os_settings.h
+++ b/ctaocrypt/include/os_settings.h
@@ -48,7 +48,7 @@
 /* #define CYASSL_LWIP */
 
 #if defined(USE_CYASSL_CONFIG) || defined(HAVE_CONFIG_H)
-    #include "config.h"   /* may not want global HAVE_CONFIG_H */
+    #include "ctc_config.h"   /* may not want global HAVE_CONFIG_H */
 #endif
 
 #include "visibility.h"
diff --git a/ctaocrypt/include/types.h b/ctaocrypt/include/types.h
index 3da664854..80aed0789 100644
--- a/ctaocrypt/include/types.h
+++ b/ctaocrypt/include/types.h
@@ -26,7 +26,7 @@
 #include "os_settings.h"
 
 #ifdef HAVE_CONFIG_H
-    #include "config.h"
+    #include "ctc_config.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/ctaocrypt/src/dsa.c b/ctaocrypt/src/dsa.c
index 1058bdfae..df9fd3078 100644
--- a/ctaocrypt/src/dsa.c
+++ b/ctaocrypt/src/dsa.c
@@ -23,7 +23,7 @@
 
 #include "ctc_dsa.h"
 #include "ctc_sha.h"
-#include "random.h"
+#include "ctc_random.h"
 #include "error.h"
 
 
diff --git a/ctaocrypt/src/random.c b/ctaocrypt/src/random.c
index 02aa80ff0..6a3486ae3 100644
--- a/ctaocrypt/src/random.c
+++ b/ctaocrypt/src/random.c
@@ -25,7 +25,7 @@
 
 */
 
-#include "random.h"
+#include "ctc_random.h"
 #include "error.h"
 
 
diff --git a/ctaocrypt/src/rsa.c b/ctaocrypt/src/rsa.c
index e72c8ba0f..3023ecc70 100644
--- a/ctaocrypt/src/rsa.c
+++ b/ctaocrypt/src/rsa.c
@@ -22,7 +22,7 @@
 
 
 #include "ctc_rsa.h"
-#include "random.h"
+#include "ctc_random.h"
 #include "error.h"
 #include "logging.h"
 
diff --git a/ctaocrypt/test/test.c b/ctaocrypt/test/test.c
index ee7fbf662..4903250c0 100644
--- a/ctaocrypt/test/test.c
+++ b/ctaocrypt/test/test.c
@@ -11,7 +11,7 @@
 #include "sha256.h"
 #include "sha512.h"
 #include "arc4.h"
-#include "random.h"
+#include "ctc_random.h"
 #include "coding.h"
 #include "asn.h"
 #include "des3.h"
diff --git a/include/cyassl_int.h b/include/cyassl_int.h
index 8dcdfcf9a..22f85b8de 100644
--- a/include/cyassl_int.h
+++ b/include/cyassl_int.h
@@ -26,7 +26,7 @@
 
 
 #include "types.h"
-#include "random.h"
+#include "ctc_random.h"
 #include "des3.h"
 #include "hc128.h"
 #include "rabbit.h"
diff --git a/src/ssl.c b/src/ssl.c
index 5ebe5ba4a..5274c619f 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -36,7 +36,7 @@
     #include "des.h"
     /* openssl headers end, cyassl internal headers next */
     #include "ctc_hmac.h"
-    #include "random.h"
+    #include "ctc_random.h"
     #include "des3.h"
     #include "ctc_md4.h"
     #include "coding.h"