diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 0d0775be7..e8b640c32 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -18,7 +18,7 @@ CLEANFILES=$(GITVERSION_FILE)
 ## Process this file with automake to produce Makefile.in
 linphone_includedir=$(includedir)/linphone
 
-linphone_include_HEADERS=linphonecore.h linphonefriend.h linphonepresence.h linphonecore_utils.h lpconfig.h sipsetup.h event.h
+linphone_include_HEADERS=linphonecore.h linphonefriend.h linphonepresence.h linphonecore_utils.h lpconfig.h sipsetup.h event.h xml2lpc.h lpc2xml.h
 
 if BUILD_TUNNEL
 linphone_include_HEADERS+=linphone_tunnel.h
@@ -53,6 +53,8 @@ liblinphone_la_SOURCES=\
 	ldap/ldapprovider.c ldap/ldapprovider.h \
 	dict.c \
 	xml.c \
+	xml2lpc.c \
+	lpc2xml.c \
 	$(GITVERSION_FILE)
 
 if BUILD_UPNP
diff --git a/tools/lpc2xml.c b/coreapi/lpc2xml.c
similarity index 100%
rename from tools/lpc2xml.c
rename to coreapi/lpc2xml.c
diff --git a/tools/lpc2xml.h b/coreapi/lpc2xml.h
similarity index 100%
rename from tools/lpc2xml.h
rename to coreapi/lpc2xml.h
diff --git a/tools/xml2lpc.c b/coreapi/xml2lpc.c
similarity index 100%
rename from tools/xml2lpc.c
rename to coreapi/xml2lpc.c
diff --git a/tools/xml2lpc.h b/coreapi/xml2lpc.h
similarity index 100%
rename from tools/xml2lpc.h
rename to coreapi/xml2lpc.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5ef2535ad..d993aa591 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -18,29 +18,6 @@ EXTRA_DIST=xml2lpc_jni.cc lpc2xml_jni.cc
 
 if BUILD_TOOLS
 
-lib_LTLIBRARIES=libxml2lpc.la liblpc2xml.la
-
-libxml2lpc_la_SOURCES=\
-	xml2lpc.c \
-	xml2lpc.h
-
-liblpc2xml_la_SOURCES=\
-	lpc2xml.c \
-	lpc2xml.h
-
-libxml2lpc_la_CFLAGS=$(COMMON_CFLAGS)
-libxml2lpc_la_LIBADD=\
-	$(top_builddir)/coreapi/liblinphone.la \
-	$(LIBXML2_LIBS) 
-
-liblpc2xml_la_CFLAGS=$(COMMON_CFLAGS)
-liblpc2xml_la_LIBADD=\
-	$(top_builddir)/coreapi/liblinphone.la \
-	$(LIBXML2_LIBS) 
-
-libxml2lpc_la_LDFLAGS=-no-undefined
-liblpc2xml_la_LDFLAGS=-no-undefined
-
 bin_PROGRAMS=xml2lpc_test lpc2xml_test lp-gen-wrappers
 
 xml2lpc_test_SOURCES=\
@@ -51,13 +28,11 @@ lpc2xml_test_SOURCES=\
 
 xml2lpc_test_CFLAGS=$(COMMON_CFLAGS)
 xml2lpc_test_LDADD=\
-	$(top_builddir)/coreapi/liblinphone.la \
-	libxml2lpc.la 
+	$(top_builddir)/coreapi/liblinphone.la
 
 lpc2xml_test_CFLAGS=$(COMMON_CFLAGS)
 lpc2xml_test_LDADD=\
-	$(top_builddir)/coreapi/liblinphone.la \
-	liblpc2xml.la
+	$(top_builddir)/coreapi/liblinphone.la
 
 lp_gen_wrappers_SOURCES=genwrappers.cc \
 			software-desc.cc software-desc.hh \