diff --git a/exports/nss_api_if.h b/exports/nss_api_if.h
index 26843a5..302165d 100644
--- a/exports/nss_api_if.h
+++ b/exports/nss_api_if.h
@@ -46,8 +46,6 @@
 #include "nss_if.h"
 #include "nss_phys_if.h"
 #include "nss_virt_if.h"
-#include "nss_ipsec.h"
-#include "nss_crypto.h"
 
 /*
  * Interface numbers are reserved in the
diff --git a/nss_core.h b/nss_core.h
index 1b8b313..1e4a020 100644
--- a/nss_core.h
+++ b/nss_core.h
@@ -36,6 +36,14 @@
 #include "nss_hlos_if.h"
 
 /*
+ * XXX:can't add this to api_if.h till the deprecated
+ * API(s) are present. Once, thats removed we will move it
+ * to this file
+ */
+#include "nss_ipsec.h"
+#include "nss_crypto.h"
+
+/*
  * NSS debug macros
  */
 #if (NSS_DEBUG_LEVEL < 1)
diff --git a/nss_crypto.c b/nss_crypto.c
index b785152..d58c7ce 100644
--- a/nss_crypto.c
+++ b/nss_crypto.c
@@ -20,6 +20,7 @@
  */
 
 #include "nss_tx_rx_common.h"
+#include "nss_crypto.h"
 
 /*
  **********************************
diff --git a/nss_ipsec.c b/nss_ipsec.c
index b7373f5..bb951a5 100644
--- a/nss_ipsec.c
+++ b/nss_ipsec.c
@@ -20,6 +20,7 @@
  */
 
 #include "nss_tx_rx_common.h"
+#include "nss_ipsec.h"
 
 /*
  **********************************