diff --git a/include/linphone/api/c-api.h b/include/linphone/api/c-api.h
index 1224497e6..a5926cb71 100644
--- a/include/linphone/api/c-api.h
+++ b/include/linphone/api/c-api.h
@@ -31,6 +31,7 @@
 #include "linphone/api/c-chat-message-cbs.h"
 #include "linphone/api/c-chat-room.h"
 #include "linphone/api/c-chat-room-cbs.h"
+#include "linphone/api/c-dial-plan.h"
 #include "linphone/api/c-event-log.h"
 #include "linphone/api/c-participant.h"
 #include "linphone/api/c-types.h"
diff --git a/include/linphone/api/c-dial-plan.h b/include/linphone/api/c-dial-plan.h
index 3a11b24f1..8bb8631b1 100644
--- a/include/linphone/api/c-dial-plan.h
+++ b/include/linphone/api/c-dial-plan.h
@@ -86,7 +86,7 @@ LINPHONE_PUBLIC const LinphoneDialPlan* linphone_dial_plan_get_all(void);
 /**
  * @return {\bctbx_list const LinphoneDialPlan*} of all known dial plans
 **/
-LINPHONE_PUBLIC const bctbx_list_t * linphone_dial_plan_get_all_list();
+LINPHONE_PUBLIC const bctbx_list_t * linphone_dial_plan_get_all_list(void);
 
 /**
  * Find best match for given CCC
diff --git a/tester/presence_server_tester.c b/tester/presence_server_tester.c
index 7e8cac7f6..50e0955c7 100644
--- a/tester/presence_server_tester.c
+++ b/tester/presence_server_tester.c
@@ -971,12 +971,12 @@ static void long_term_presence_with_phone_without_sip(void) {
 		
 		while ((dialPlan = linphone_dial_plan_by_ccc_as_int(bctbx_random()%900)) == linphone_dial_plan_by_ccc(NULL));
 		/*now with have a dialplan*/
-		for (i = 0; i < MIN((size_t)dialPlan->nnl,sizeof(phone)-1); i++) {
+		for (i = 0; i < MIN((size_t)linphone_dial_plan_get_national_number_length(dialPlan),sizeof(phone)-1); i++) {
 			phone[i] = '0' + rand() % 10;
 		}
 		phone[i]='\0';
 		
-		e164=ms_strdup_printf("+%s%s",dialPlan->ccc,phone);
+		e164=ms_strdup_printf("+%s%s",linphone_dial_plan_get_country_calling_code(dialPlan),phone);
 		
 		ms_message("Phone number is %s, e164 is %s", phone, e164);
 		
@@ -1001,7 +1001,7 @@ static void long_term_presence_with_phone_without_sip(void) {
 		/*know adding ccc to proxy config*/
 		proxy_config = linphone_core_get_default_proxy_config(pauline->lc);
 		linphone_proxy_config_edit(proxy_config);
-		linphone_proxy_config_set_dial_prefix(proxy_config, dialPlan->ccc);
+		linphone_proxy_config_set_dial_prefix(proxy_config, linphone_dial_plan_get_country_calling_code(dialPlan));
 		linphone_proxy_config_done(proxy_config);
 		/*re-create sub list*/
 		linphone_friend_list_enable_subscriptions(linphone_core_get_default_friend_list(pauline->lc), FALSE);
@@ -1032,12 +1032,12 @@ static char * generate_random_e164_phone_from_dial_plan(const LinphoneDialPlan *
 	char phone[64];
 	size_t i;
 	/*now with have a dialplan*/
-	for (i = 0; i < MIN((size_t)dialPlan->nnl,sizeof(phone)-1); i++) {
+	for (i = 0; i < MIN((size_t)linphone_dial_plan_get_national_number_length(dialPlan),sizeof(phone)-1); i++) {
 		phone[i] = '0' + rand() % 10;
 	}
 	phone[i]='\0';
 	
-	return ms_strdup_printf("+%s%s",dialPlan->ccc,phone);
+	return ms_strdup_printf("+%s%s",linphone_dial_plan_get_country_calling_code(dialPlan),phone);
 }
 /* use case:
   I have a friend, I invite him to use Linphone for the first time.