diff --git a/bin/Makefile.am b/bin/Makefile.am
index 99524a1..900a6e7 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -105,7 +105,6 @@ icwmpd_LDADD =			\
 icwmpd_CFLAGS+=-DCWMP_VERSION=\"$(CWMP_VERSION)\"
 icwmpd_LDFLAGS+=-DCWMP_VERSION=\"$(CWMP_VERSION)\"
 
-icwmpd_LDFLAGS+=$(STAGING_DIR)/usr/lib/libstrophe.so
 CWMP_BKP_FILE=/etc/icwmpd/.icwmpd_backup_session.xml
 icwmpd_CFLAGS+=-DCWMP_BKP_FILE=\"$(CWMP_BKP_FILE)\"
 icwmpd_CFLAGS+=-I../inc
@@ -114,4 +113,3 @@ icwmpd_CFLAGS+=-I../dm/dmtree/
 icwmpd_CFLAGS+=-I../dm/dmtree/common
 icwmpd_CFLAGS+=-I../dm/dmtree/tr098
 icwmpd_CFLAGS+=-I../dm/dmtree/tr181
-icwmpd_CFLAGS+="-I$(STAGING_DIR)/usr/include/strophe/"
diff --git a/cwmp.c b/cwmp.c
index 2d62011..1e27058 100644
--- a/cwmp.c
+++ b/cwmp.c
@@ -25,7 +25,9 @@
 #include "ubus.h"
 #include "ipping.h"
 #include "xmpp_cr.h"
+#ifdef XMPP_ENABLE
 #include <strophe.h>
+#endif
 #include <unistd.h>
  
 struct cwmp         	cwmp_main = {0};
diff --git a/inc/cwmp.h b/inc/cwmp.h
index 831e64f..9802dd5 100644
--- a/inc/cwmp.h
+++ b/inc/cwmp.h
@@ -19,7 +19,9 @@
 #include <pthread.h>
 #include <microxml.h>
 #include <libubox/list.h>
+#ifdef XMPP_ENABLE
 #include <strophe.h>
+#endif
 
 #define MAX_EVENTS							64
 #define MAX_INT32							2147483646
@@ -273,8 +275,10 @@ typedef struct cwmp {
     struct session_status session_status;
     unsigned int cwmp_id;
     int cr_socket_desc;
+#ifdef XMPP_ENABLE
 	xmpp_ctx_t 			*xmpp_ctx;
 	xmpp_conn_t 		*xmpp_conn;
+#endif
 } cwmp;
 
 typedef struct session {
diff --git a/inc/xmpp_cr.h b/inc/xmpp_cr.h
index e79cc0e..0404d53 100644
--- a/inc/xmpp_cr.h
+++ b/inc/xmpp_cr.h
@@ -15,7 +15,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef XMPP_ENABLE
 #include <strophe.h>
+#endif
 
 #define DEFAULT_XMPP_RECONNECTION_RETRY			5
 void cwmp_xmpp_connect_client();