diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 9acf9dd27..96be8a14d 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -126,7 +126,7 @@ else
 liblinphone_la_SOURCES+=vcard_stubs.c vcard.h
 endif
 
-liblinphone_la_LDFLAGS=-lstdc++ -version-info $(LIBLINPHONE_SO_VERSION) -no-undefined
+liblinphone_la_LDFLAGS=-version-info $(LIBLINPHONE_SO_VERSION) -no-undefined
 
 if HAVE_LD_OUTPUT_DEF
 liblinphone_la_LDFLAGS += -Wl,--output-def,liblinphone-$(LIBLINPHONE_SO_CURRENT).def
@@ -159,7 +159,8 @@ liblinphone_la_LIBADD= \
 AM_CPPFLAGS=\
 	-I$(top_srcdir) -I$(top_srcdir)/include -I$(builddir) \
 	$(ORTP_CFLAGS) \
-	$(MEDIASTREAMER_CFLAGS)
+	$(MEDIASTREAMER_CFLAGS) \
+	$(LIBXML2_CFLAGS)
 
 COMMON_CFLAGS=\
 	$(STRICT_OPTIONS) \