diff --git a/cyassl/ctaocrypt/asn.h b/cyassl/ctaocrypt/asn.h
index 7ff2ef316..58c75803d 100644
--- a/cyassl/ctaocrypt/asn.h
+++ b/cyassl/ctaocrypt/asn.h
@@ -24,6 +24,17 @@
 #ifndef CTAO_CRYPT_ASN_H
 #define CTAO_CRYPT_ASN_H
 
+/* pull in compatibility for each include */
+#include <cyassl/ctaocrypt/dh.h>
+#include <cyassl/ctaocrypt/dsa.h>
+#include <cyassl/ctaocrypt/sha.h>
+#include <cyassl/ctaocrypt/md5.h>
+#include <cyassl/ctaocrypt/asn_public.h>   /* public interface */
+#ifdef HAVE_ECC
+    #include <cyassl/ctaocrypt/ecc.h>
+#endif
+
+
 #include <wolfssl/wolfcrypt/asn.h>
 
 #ifndef WOLFSSL_PEMCERT_TODER_DEFINED
diff --git a/cyassl/ctaocrypt/asn_public.h b/cyassl/ctaocrypt/asn_public.h
index 5d084375a..040734eab 100644
--- a/cyassl/ctaocrypt/asn_public.h
+++ b/cyassl/ctaocrypt/asn_public.h
@@ -23,8 +23,15 @@
 #ifndef CTAO_CRYPT_ASN_PUBLIC_H
 #define CTAO_CRYPT_ASN_PUBLIC_H
 
+/* pull in compatibility for each of the includes */
 #include <cyassl/ctaocrypt/types.h>
-#include <wolfssl/wolfrypt/asn_public.h>
+#include <cyassl/ctaocrypt/types.h>
+#include <cyassl/ctaocrypt/ecc.h>
+#ifdef WOLFSSL_CERT_GEN
+    #include <cyassl/ctaocrypt/rsa.h>
+#endif
+
+#include <wolfssl/wolfcrypt/asn_public.h>
 #ifdef WOLFSSL_CERT_GEN
     #define InitCert wc_InitCert
     #define MakeCert wc_MakeCert
diff --git a/cyassl/ctaocrypt/pkcs7.h b/cyassl/ctaocrypt/pkcs7.h
index 7b5393578..dfb7c2fd3 100644
--- a/cyassl/ctaocrypt/pkcs7.h
+++ b/cyassl/ctaocrypt/pkcs7.h
@@ -25,6 +25,13 @@
 #ifndef CTAO_CRYPT_PKCS7_H
 #define CTAO_CRYPT_PKCS7_H
 
+/* pull in compatibility for old includes */
+#include <cyassl/ctaocrypt/types.h>
+#include <cyassl/ctaocrypt/asn.h>
+#include <cyassl/ctaocrypt/asn_public.h>
+#include <cyassl/ctaocrypt/random.h>
+#include <cyassl/ctaocrypt/des3.h>
+
 #include <wolfssl/wolfcrypt/pkcs7.h>
 
 /* for pkcs7 reverse compatibility */
diff --git a/cyassl/ctaocrypt/types.h b/cyassl/ctaocrypt/types.h
index 810f73b65..95bfb45e0 100644
--- a/cyassl/ctaocrypt/types.h
+++ b/cyassl/ctaocrypt/types.h
@@ -35,25 +35,5 @@
 #define cyassl_word         wolfssl_word
 #define CYASSL_MAX_ERROR_SZ WOLFSSL_MAX_ERROR_SZ
 
-/* if macros need to be reverted back to previous name for fips */
-//    #define WOLFSSL_MAX_ERROR_SZ CYASSL_MAX_ERROR_SZ
-//
-//    #define WOLFSSL_WORD_SIZE    CYASSL_WORD_SIZE
-//    #define WOLFSSL_BIT_SIZE     CYASSL_BIT_SIZE
-//    #define WOLFSSL_MAX_16BIT    CYASSL_MAX_16BIT
-//    #define WOLFSSL_MAX_ERROR_SZ CYASSL_MAX_ERROR_SZ
-//    #define wolfssl_word cyassl_word
-///* memory macros */
-//    /* when using fips map wolfSSL to CyaSSL*/
-//    #define wolfSSL_Malloc_cb     CyaSSL_Malloc_cb
-//    #define wolfSSL_Free_cb       CyaSSL_Free_cb
-//    #define wolfSSL_Realloc_cb    CyaSSL_Realloc_cb
-//    #define wolfSSL_SetAllocators CyaSSL_SetAllocators
-//
-//    /* Public in case user app wants to use XMALLOC/XFREE */
-//	#define wolfSSL_Malloc  CyaSSL_Malloc
-//	#define wolfSSL_Free    CyaSSL_Free
-//	#define wolfSSL_Realloc CyaSSL_Realloc
-
 #endif /* CTAO_CRYPT_TYPES_H */