diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 70a7f82b5..cfadd0193 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -104,7 +104,7 @@ test_numbers_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
 endif
 
 AM_CPPFLAGS=\
-	-I$(top_srcdir)
+	-I$(top_srcdir) -I$(top_srcdir)/include
 
 AM_CFLAGS=\
 	$(STRICT_OPTIONS)  -DIN_LINPHONE \
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 2012492c4..47e1b166c 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -33,10 +33,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define LINPHONE_IPADDR_SIZE 64
 #define LINPHONE_HOSTNAME_SIZE 128
 
-#ifdef LIBLINPHONE_EXPORTS
-#define LINPHONE_PUBLIC	__declspec(dllexport)
-#else 
-#define LINPHONE_PUBLIC	__declspec(dllimport)
+#ifndef LINPHONE_PUBLIC
+	#define LINPHONE_PUBLIC MS2_PUBLIC
 #endif
 
 #ifdef __cplusplus
diff --git a/coreapi/lpconfig.c b/coreapi/lpconfig.c
index 5f90855f5..03e06ddc0 100644
--- a/coreapi/lpconfig.c
+++ b/coreapi/lpconfig.c
@@ -228,7 +228,7 @@ LpConfig * lp_config_new(const char *filename){
 #endif
 			if ((stat(filename,&fileStat) == 0) && (S_ISREG(fileStat.st_mode))) {
 				/* make existing configuration files non-group/world-accessible */
-				if (_chmod(filename, _S_IREAD | _S_IWRITE) == -1) {
+				if (chmod(filename, S_IREAD | S_IWRITE) == -1) {
 					ms_warning("unable to correct permissions on "
 					"configuration file: %s", strerror(errno));
 				}
diff --git a/coreapi/misc.c b/coreapi/misc.c
index 114fb1133..6758cb91f 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -112,7 +112,7 @@ int remove_lock_file()
 char *int2str(int number)
 {
 	char *numstr=ms_malloc(10);
-	_snprintf(numstr,10,"%i",number);
+	snprintf(numstr,10,"%i",number);
 	return numstr;
 }
 
diff --git a/coreapi/upnp.c b/coreapi/upnp.c
index 528bfaed1..28477b4de 100644
--- a/coreapi/upnp.c
+++ b/coreapi/upnp.c
@@ -488,7 +488,7 @@ int linphone_upnp_context_send_add_port_binding(UpnpContext *lupnp, UpnpPortBind
 			mapping.remote_port = port->external_port;
 		mapping.remote_host = "";
 		snprintf(description, 128, "%s %s at %s:%d",
-				LINPHONE_PACKAGE_NAME,
+				PACKAGE_NAME,
 				(port->protocol == UPNP_IGD_IP_PROTOCOL_TCP)? "TCP": "UDP",
 				port->local_addr, port->local_port);
 		mapping.description = description;
diff --git a/include/sal/sal.h b/include/sal/sal.h
index 80a747fe3..70a788769 100644
--- a/include/sal/sal.h
+++ b/include/sal/sal.h
@@ -29,10 +29,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "mediastreamer2/mscommon.h"
 #include "ortp/ortp_srtp.h"
 
-#ifdef LIBLINPHONE_EXPORTS
-#define LINPHONE_PUBLIC	__declspec(dllexport)
-#else 
-#define LINPHONE_PUBLIC	__declspec(dllimport)
+#ifndef LINPHONE_PUBLIC
+	#define LINPHONE_PUBLIC MS2_PUBLIC
 #endif
 
 /*Dirty hack, keep in sync with mediastreamer2/include/mediastream.h */
diff --git a/tester/call_tester.c b/tester/call_tester.c
index b7ff3465c..0715fad79 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -475,7 +475,6 @@ static void simple_call_transfer(void) {
 	LinphoneCoreManager* pauline = linphone_core_manager_new("./tester/pauline_rc");
 	LinphoneCoreManager* laure = linphone_core_manager_new("./tester/laure_rc");
 	LinphoneCall* pauline_called_by_marie;
-	LinphoneCall* marie_call_pauline;
 
 	char* laure_identity=linphone_address_as_string(laure->identity);
 	MSList* lcs=ms_list_append(NULL,marie->lc);