diff --git a/ctaocrypt/benchmark/benchmark.c b/ctaocrypt/benchmark/benchmark.c
index f6f9c921d..de964ac29 100644
--- a/ctaocrypt/benchmark/benchmark.c
+++ b/ctaocrypt/benchmark/benchmark.c
@@ -12,7 +12,7 @@
 #include "ctc_md5.h"
 #include "ctc_sha.h"
 #include "ctc_sha256.h"
-#include "sha512.h"
+#include "ctc_sha512.h"
 #include "ctc_rsa.h"
 #include "ctc_asn.h"
 #include "ctc_ripemd.h"
diff --git a/ctaocrypt/include/ctc_integer.h b/ctaocrypt/include/ctc_integer.h
index 941d48245..842f2e605 100644
--- a/ctaocrypt/include/ctc_integer.h
+++ b/ctaocrypt/include/ctc_integer.h
@@ -35,7 +35,7 @@
 */
 #include "ctc_types.h"       /* will set MP_xxBIT if not default */
 #ifdef USE_FAST_MATH
-    #include "tfm.h"
+    #include "ctc_tfm.h"
 #else
 
 #ifndef CHAR_BIT
diff --git a/ctaocrypt/include/sha512.h b/ctaocrypt/include/ctc_sha512.h
similarity index 99%
rename from ctaocrypt/include/sha512.h
rename to ctaocrypt/include/ctc_sha512.h
index 69d585c91..05225889c 100644
--- a/ctaocrypt/include/sha512.h
+++ b/ctaocrypt/include/ctc_sha512.h
@@ -1,4 +1,4 @@
-/* sha512.h
+/* ctc_sha512.h
  *
  * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
  *
diff --git a/ctaocrypt/include/tfm.h b/ctaocrypt/include/ctc_tfm.h
similarity index 99%
rename from ctaocrypt/include/tfm.h
rename to ctaocrypt/include/ctc_tfm.h
index e61484af6..56ba5a606 100644
--- a/ctaocrypt/include/tfm.h
+++ b/ctaocrypt/include/ctc_tfm.h
@@ -1,4 +1,4 @@
-/* tfm.h
+/* ctc_tfm.h
  *
  * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
  *
diff --git a/ctaocrypt/src/pwdbased.c b/ctaocrypt/src/pwdbased.c
index a96aadad0..bdea662d5 100644
--- a/ctaocrypt/src/pwdbased.c
+++ b/ctaocrypt/src/pwdbased.c
@@ -27,7 +27,7 @@
 #include "ctc_integer.h"
 #include "ctc_error.h"
 #ifdef CYASSL_SHA512
-    #include "sha512.h"
+    #include "ctc_sha512.h"
 #endif
 #ifdef NO_INLINE
     #include "ctc_misc.h"
diff --git a/ctaocrypt/src/sha512.c b/ctaocrypt/src/sha512.c
index e3a0d6ee3..d3191f9bc 100644
--- a/ctaocrypt/src/sha512.c
+++ b/ctaocrypt/src/sha512.c
@@ -22,7 +22,7 @@
 
 #ifdef CYASSL_SHA512
 
-#include "sha512.h"
+#include "ctc_sha512.h"
 #ifdef NO_INLINE
     #include "ctc_misc.h"
 #else
diff --git a/ctaocrypt/src/tfm.c b/ctaocrypt/src/tfm.c
index f73945379..354e9fbd8 100644
--- a/ctaocrypt/src/tfm.c
+++ b/ctaocrypt/src/tfm.c
@@ -33,7 +33,7 @@
 
 #ifdef USE_FAST_MATH
 
-#include "tfm.h"
+#include "ctc_tfm.h"
 #include "asm.c"  /* will define asm MACROS or C ones */
 
 
diff --git a/ctaocrypt/test/test.c b/ctaocrypt/test/test.c
index 592b9d544..7c69b8f35 100644
--- a/ctaocrypt/test/test.c
+++ b/ctaocrypt/test/test.c
@@ -9,7 +9,7 @@
 #include "ctc_md4.h"
 #include "ctc_sha.h"
 #include "ctc_sha256.h"
-#include "sha512.h"
+#include "ctc_sha512.h"
 #include "ctc_arc4.h"
 #include "ctc_random.h"
 #include "ctc_coding.h"