diff --git a/bin/Makefile.am b/bin/Makefile.am
index 9ace687d..3c124fe4 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -34,7 +34,14 @@ lib_LTLIBRARIES += libbbfdm.la
 libbbfdm_la_SOURCES =	\
 	../dmentry.c 		\
 	../dmdiagnostics.c	\
-	../dmbbfcommon.c
+	../dmbbfcommon.c        \
+	../libbbf_api/dmbbf.c			\
+	../libbbf_api/dmubus.c			\
+	../libbbf_api/dmjson.c			\
+	../libbbf_api/dmuci.c			\
+	../libbbf_api/dmcommon.c 		\
+	../libbbf_api/dmmem.c			\
+	../libbbf_api/dmapi.c
 
 if BBF_TR181
 libbbfdm_la_SOURCES +=							\
@@ -181,8 +188,7 @@ libbbfdm_la_LIBADD =		\
 	$(LIBDLOPEN_LIBS) 		\
 	$(LIBCURL_LIBS)			\
 	$(LIBSSL_LIBS)		\
-	$(LIBCRYPTO_LIBS)		\
-	-lbbf_api
+	$(LIBCRYPTO_LIBS)
 
 libbbfdm_la_CFLAGS+=-I../
 libbbfdm_la_CFLAGS+=-I../dmtree
diff --git a/configure.ac b/configure.ac
index 536afb89..8541e6a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,25 +111,25 @@ AC_SUBST([LIBDLOPEN_LIBS])
 LIBCURL_LIBS='-lcurl'
 AC_SUBST([LIBCURL_LIBS])
 
-LIBCRYPTO_LIBS='-lcrypto'
-AC_SUBST([LIBCRYPTO_LIBS])
-
 AM_COND_IF([LWOLFSSL], [
 	LIBSSL_LIBS='-lwolfssl'
 	AC_SUBST([LIBSSL_LIBS])
-	AC_DEFINE(LSSL)
+	LIBCRYPTO_LIBS='-lcrypto'
+	AC_SUBST([LIBCRYPTO_LIBS])
 ])
 
 AM_COND_IF([LOPENSSL], [
 	LIBSSL_LIBS='-lssl'
 	AC_SUBST([LIBSSL_LIBS])
-	AC_DEFINE(LSSL)
+	LIBCRYPTO_LIBS='-lcrypto'
+	AC_SUBST([LIBCRYPTO_LIBS])
 ])
 
 AM_COND_IF([LMBEDTLS], [
 	LIBSSL_LIBS='-lmbedtls'
 	AC_SUBST([LIBSSL_LIBS])
-	AC_DEFINE(LSSL)
+	LIBCRYPTO_LIBS='-lmbedcrypto'
+	AC_SUBST([LIBCRYPTO_LIBS])
 ])
 
 # checks for header files
diff --git a/dmtree/tr181/device.c b/dmtree/tr181/device.c
index 435ff3fb..194b22cf 100644
--- a/dmtree/tr181/device.c
+++ b/dmtree/tr181/device.c
@@ -115,9 +115,9 @@ DMOBJ tDeviceObj[] = {
 {"DynamicDNS", &DMREAD, NULL, NULL, "file:/etc/config/ddns", NULL, NULL, NULL, tDynamicDNSObj, tDynamicDNSParams, NULL, BBFDM_BOTH, NULL, "2.10"},
 {"QoS", &DMREAD, NULL, NULL, "file:/etc/config/qos", NULL, NULL, NULL, tQoSObj, tQoSParams, NULL, BBFDM_BOTH, NULL, "2.0"},
 {"LANConfigSecurity", &DMREAD, NULL, NULL, "file:/etc/config/users", NULL, NULL, NULL, NULL, tLANConfigSecurityParams, NULL, BBFDM_BOTH, NULL, "2.0"},
-#ifdef LSSL
+#if defined(LOPENSSL) || defined(LMBEDTLS) || defined(LWOLFSSL)
 {"Security", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tSecurityObj, tSecurityParams, NULL, BBFDM_BOTH, NULL, "2.4"},
-#endif /* LSSL */
+#endif
 {"RouterAdvertisement", &DMREAD, NULL, NULL, "file:/etc/config/dhcp", NULL, NULL, NULL, tRouterAdvertisementObj, tRouterAdvertisementParams, NULL, BBFDM_BOTH, NULL, "2.2"},
 #ifdef BBF_TR104
 {"Services", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tServicesObj, NULL, NULL, BBFDM_BOTH, NULL, "2.0"},
diff --git a/dmtree/tr181/security.c b/dmtree/tr181/security.c
index 1ac42b05..5488f068 100644
--- a/dmtree/tr181/security.c
+++ b/dmtree/tr181/security.c
@@ -10,11 +10,10 @@
 
 #include "security.h"
 
+#if defined(LOPENSSL) || defined(LWOLFSSL) || defined(LMBEDTLS)
 #define DATE_LEN 128
 #define MAX_CERT 32
 
-#ifdef LSSL
-
 #ifdef LMBEDTLS
 #include <mbedtls/x509_crt.h>
 #include <mbedtls/base64.h>
@@ -435,4 +434,4 @@ DMLEAF tSecurityCertificateParams[] = {
 {0}
 };
 
-#endif /* LSSL */
+#endif
diff --git a/dmtree/tr181/security.h b/dmtree/tr181/security.h
index f4a721a0..ed19494f 100644
--- a/dmtree/tr181/security.h
+++ b/dmtree/tr181/security.h
@@ -11,13 +11,13 @@
 #ifndef __SECURITY_H
 #define __SECURITY_H
 
-#ifdef LSSL
+#if defined(LOPENSSL) || defined(LWOLFSSL) || defined(LMBEDTLS)
 #include <libbbf_api/dmcommon.h>
 
 extern DMOBJ tSecurityObj[];
 extern DMLEAF tSecurityParams[];
 extern DMLEAF tSecurityCertificateParams[];
-#endif /* LSSL */
+#endif
 
 #endif //__SECURITY_H
 
diff --git a/libbbf_api/dmcommon.c b/libbbf_api/dmcommon.c
index 0d61915b..a7c130ac 100644
--- a/libbbf_api/dmcommon.c
+++ b/libbbf_api/dmcommon.c
@@ -43,7 +43,6 @@ char *ServerSelectionProtocol[] = {"ICMP", "UDP Echo", NULL};
 char *DHCPType[] = {"DHCPv4", "DHCPv6", NULL};
 char *DropAlgorithm[] = {"RED", "DT", "WRED", "BLUE", NULL};
 char *SchedulerAlgorithm[] = {"WFQ", "WRR", "SP", NULL};
-char *DTMFMethod[] = {"InBand", "RFC2833", "SIPInfo", NULL};
 char *ProfileEnable[] = {"Disabled", "Quiescent", "Enabled", NULL};
 char *SupportedOperatingChannelBandwidth[] = {"20MHz", "40MHz", "80MHz", "160MHz", "80+80MHz", "Auto", NULL};
 char *SupportedStandards[] = {"a", "b", "g", "n", "ac", "ax", NULL};
diff --git a/libbbf_api/dmcommon.h b/libbbf_api/dmcommon.h
index f9958d53..61d87898 100644
--- a/libbbf_api/dmcommon.h
+++ b/libbbf_api/dmcommon.h
@@ -95,7 +95,6 @@ extern char *ServerSelectionProtocol[];
 extern char *DHCPType[];
 extern char *DropAlgorithm[];
 extern char *SchedulerAlgorithm[];
-extern char *DTMFMethod[];
 extern char *ProfileEnable[];
 extern char *PIN[];
 extern char *DestinationAddress[];