diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 4f49da8d7..818aa44a2 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -100,7 +100,7 @@ endif
 endif
 
 
-AM_CPPFLAGS= -I$(top_srcdir)/coreapi/ -I$(top_builddir)/coreapi/ \
+AM_CPPFLAGS= -I$(top_srcdir)/include/ -I$(top_builddir)/coreapi/ \
 		$(MEDIASTREAMER_CFLAGS) \
 		$(ORTP_CFLAGS) $(BELLESIP_CFLAGS) \
 		$(STRICT_OPTIONS) $(STRICT_OPTIONS_CC) $(LIBGTK_CFLAGS) $(LIBGTKMAC_CFLAGS) $(IPV6_CFLAGS) \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a5a1da287..1e2f13835 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,6 +2,7 @@
 
 AM_CPPFLAGS=\
 	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/coreapi
 
 COMMON_CFLAGS=\
diff --git a/tools/test_ecc.c b/tools/test_ecc.c
index de1434ece..c2259d30c 100644
--- a/tools/test_ecc.c
+++ b/tools/test_ecc.c
@@ -18,8 +18,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include "linphonecore.h"
-#include "linphonecore_utils.h"
+#include "linphone/core.h"
+#include "linphone/core_utils.h"
 #if _MSC_VER
 #include <io.h>
 #endif
diff --git a/tools/test_lsd.c b/tools/test_lsd.c
index 81c424b3a..c574079d9 100644
--- a/tools/test_lsd.c
+++ b/tools/test_lsd.c
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  This file is a test program that plays several sound files and places a call simultatenously.
 */
 
-#include "linphonecore_utils.h"
+#include "linphone/core_utils.h"
 
 static void play_finished(LsdPlayer *p) {
 	const char *filename = (const char *)lsd_player_get_user_pointer(p);
diff --git a/tools/test_numbers.c b/tools/test_numbers.c
index b6c83a047..33abb2d7a 100644
--- a/tools/test_numbers.c
+++ b/tools/test_numbers.c
@@ -18,8 +18,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include "linphonecore.h"
-#include "linphonecore_utils.h"
+#include "linphone/core.h"
+#include "linphone/core_utils.h"
 
 int main(int argc, char *argv[]) {
 	LinphoneProxyConfig *cfg;