diff --git a/ctaocrypt/include/coding.h b/ctaocrypt/include/ctc_coding.h
similarity index 98%
rename from ctaocrypt/include/coding.h
rename to ctaocrypt/include/ctc_coding.h
index d880d0afc..bfe26ed2a 100644
--- a/ctaocrypt/include/coding.h
+++ b/ctaocrypt/include/ctc_coding.h
@@ -1,4 +1,4 @@
-/* coding.h
+/* ctc_coding.h
  *
  * Copyright (C) 2006-2011 Sawtooth Consulting Ltd.
  *
diff --git a/ctaocrypt/src/asn.c b/ctaocrypt/src/asn.c
index f911473b4..60e1336ee 100644
--- a/ctaocrypt/src/asn.c
+++ b/ctaocrypt/src/asn.c
@@ -25,7 +25,7 @@
     #include "dc_rtc_api.h"   /* to get current time */
 #endif
 #include "ctc_asn.h"
-#include "coding.h"
+#include "ctc_coding.h"
 #include "ctc_sha.h"
 #include "ctc_md5.h"
 #include "ctc_error.h"
diff --git a/ctaocrypt/src/coding.c b/ctaocrypt/src/coding.c
index bff5c2e85..ce8b61f09 100644
--- a/ctaocrypt/src/coding.c
+++ b/ctaocrypt/src/coding.c
@@ -20,7 +20,7 @@
  */
 
 
-#include "coding.h"
+#include "ctc_coding.h"
 #include "ctc_error.h"
 #include "logging.h"
 
diff --git a/ctaocrypt/test/test.c b/ctaocrypt/test/test.c
index d3071a5fc..97b385c72 100644
--- a/ctaocrypt/test/test.c
+++ b/ctaocrypt/test/test.c
@@ -12,7 +12,7 @@
 #include "sha512.h"
 #include "ctc_arc4.h"
 #include "ctc_random.h"
-#include "coding.h"
+#include "ctc_coding.h"
 #include "ctc_asn.h"
 #include "des3.h"
 #include "ctc_aes.h"
diff --git a/src/ssl.c b/src/ssl.c
index 5274c619f..a09ba6164 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -23,7 +23,7 @@
 #include "ssl.h"
 #include "cyassl_int.h"
 #include "cyassl_error.h"
-#include "coding.h"
+#include "ctc_coding.h"
 
 #if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER)
     #include "evp.h"
@@ -39,7 +39,6 @@
     #include "ctc_random.h"
     #include "des3.h"
     #include "ctc_md4.h"
-    #include "coding.h"
 #endif
 
 #ifdef HAVE_ERRNO_H