diff --git a/ctaocrypt/include/misc.h b/ctaocrypt/include/ctc_misc.h
similarity index 99%
rename from ctaocrypt/include/misc.h
rename to ctaocrypt/include/ctc_misc.h
index 0b187f941..15062cdc0 100644
--- a/ctaocrypt/include/misc.h
+++ b/ctaocrypt/include/ctc_misc.h
@@ -1,4 +1,4 @@
-/* misc.h
+/* ctc_misc.h
  *
  * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
  *
diff --git a/ctaocrypt/src/aes.c b/ctaocrypt/src/aes.c
index 25a0e5101..0003b1304 100644
--- a/ctaocrypt/src/aes.c
+++ b/ctaocrypt/src/aes.c
@@ -25,7 +25,7 @@
 #include "error.h"
 #include "logging.h"
 #ifdef NO_INLINE
-    #include "misc.h"
+    #include "ctc_misc.h"
 #else
     #include "misc.c"
 #endif
diff --git a/ctaocrypt/src/des3.c b/ctaocrypt/src/des3.c
index de088d7c6..b8ae83fc5 100644
--- a/ctaocrypt/src/des3.c
+++ b/ctaocrypt/src/des3.c
@@ -24,7 +24,7 @@
 
 #include "des3.h"
 #ifdef NO_INLINE
-    #include "misc.h"
+    #include "ctc_misc.h"
 #else
     #include "misc.c"
 #endif
diff --git a/ctaocrypt/src/md4.c b/ctaocrypt/src/md4.c
index 0dcc59d09..b772c3d96 100644
--- a/ctaocrypt/src/md4.c
+++ b/ctaocrypt/src/md4.c
@@ -24,7 +24,7 @@
 
 #include "ctc_md4.h"
 #ifdef NO_INLINE
-    #include "misc.h"
+    #include "ctc_misc.h"
 #else
     #include "misc.c"
 #endif
diff --git a/ctaocrypt/src/md5.c b/ctaocrypt/src/md5.c
index 6ee957ae9..033c83096 100644
--- a/ctaocrypt/src/md5.c
+++ b/ctaocrypt/src/md5.c
@@ -22,7 +22,7 @@
 
 #include "ctc_md5.h"
 #ifdef NO_INLINE
-    #include "misc.h"
+    #include "ctc_misc.h"
 #else
     #include "misc.c"
 #endif
diff --git a/ctaocrypt/src/misc.c b/ctaocrypt/src/misc.c
index d823fc621..8552d2a33 100644
--- a/ctaocrypt/src/misc.c
+++ b/ctaocrypt/src/misc.c
@@ -20,7 +20,7 @@
  */
 
 
-#include "misc.h"
+#include "ctc_misc.h"
 
 /* inlining these functions is a huge speed increase and a small size decrease, 
    because the functions are smaller than function call setup/cleanup, e.g.,
diff --git a/ctaocrypt/src/pwdbased.c b/ctaocrypt/src/pwdbased.c
index 1b4cc195c..ecbff464d 100644
--- a/ctaocrypt/src/pwdbased.c
+++ b/ctaocrypt/src/pwdbased.c
@@ -30,7 +30,7 @@
     #include "sha512.h"
 #endif
 #ifdef NO_INLINE
-    #include "misc.h"
+    #include "ctc_misc.h"
 #else
     #include "misc.c"
 #endif
diff --git a/ctaocrypt/src/ripemd.c b/ctaocrypt/src/ripemd.c
index ae0fab32b..1397f11f9 100644
--- a/ctaocrypt/src/ripemd.c
+++ b/ctaocrypt/src/ripemd.c
@@ -24,7 +24,7 @@
 
 #include "ctc_ripemd.h"
 #ifdef NO_INLINE
-    #include "misc.h"
+    #include "ctc_misc.h"
 #else
     #include "misc.c"
 #endif
diff --git a/ctaocrypt/src/sha.c b/ctaocrypt/src/sha.c
index e0c132bc0..6d817d37a 100644
--- a/ctaocrypt/src/sha.c
+++ b/ctaocrypt/src/sha.c
@@ -22,7 +22,7 @@
 
 #include "ctc_sha.h"
 #ifdef NO_INLINE
-    #include "misc.h"
+    #include "ctc_misc.h"
 #else
     #include "misc.c"
 #endif
diff --git a/ctaocrypt/src/sha256.c b/ctaocrypt/src/sha256.c
index e94aa4250..0d6bd9a0d 100644
--- a/ctaocrypt/src/sha256.c
+++ b/ctaocrypt/src/sha256.c
@@ -27,7 +27,7 @@
 
 #include "sha256.h"
 #ifdef NO_INLINE
-    #include "misc.h"
+    #include "ctc_misc.h"
 #else
     #include "misc.c"
 #endif
diff --git a/ctaocrypt/src/sha512.c b/ctaocrypt/src/sha512.c
index 8bdfd96ac..e3a0d6ee3 100644
--- a/ctaocrypt/src/sha512.c
+++ b/ctaocrypt/src/sha512.c
@@ -24,7 +24,7 @@
 
 #include "sha512.h"
 #ifdef NO_INLINE
-    #include "misc.h"
+    #include "ctc_misc.h"
 #else
     #include "misc.c"
 #endif