diff --git a/src/c-wrapper/api/c-address.cpp b/src/c-wrapper/api/c-address.cpp
index 640ef6f03..e258d888a 100644
--- a/src/c-wrapper/api/c-address.cpp
+++ b/src/c-wrapper/api/c-address.cpp
@@ -34,8 +34,8 @@ LinphoneAddress *linphone_address_new (const char *address) {
 		return nullptr;
 	}
 
-	LinphoneAddress *object = _linphone_Address_init();
-	object->cppPtr = cppPtr;
+	LinphoneAddress *object = L_INIT(Address);
+	L_SET_CPP_PTR_FROM_C_OBJECT(object, cppPtr);
 	return object;
 }
 
@@ -53,135 +53,135 @@ void linphone_address_unref (LinphoneAddress *address) {
 }
 
 const char *linphone_address_get_scheme (const LinphoneAddress *address) {
-	return L_STRING_TO_C(address->cppPtr->getScheme());
+	return L_STRING_TO_C(L_GET_CPP_PTR_FROM_C_OBJECT(address)->getScheme());
 }
 
 const char *linphone_address_get_display_name (const LinphoneAddress *address) {
-	return L_STRING_TO_C(address->cppPtr->getDisplayName());
+	return L_STRING_TO_C(L_GET_CPP_PTR_FROM_C_OBJECT(address)->getDisplayName());
 }
 
 LinphoneStatus linphone_address_set_display_name (LinphoneAddress *address, const char *display_name) {
-	return !address->cppPtr->setDisplayName(L_C_TO_STRING(display_name));
+	return !L_GET_CPP_PTR_FROM_C_OBJECT(address)->setDisplayName(L_C_TO_STRING(display_name));
 }
 
 const char *linphone_address_get_username (const LinphoneAddress *address) {
-	return L_STRING_TO_C(address->cppPtr->getUsername());
+	return L_STRING_TO_C(L_GET_CPP_PTR_FROM_C_OBJECT(address)->getUsername());
 }
 
 LinphoneStatus linphone_address_set_username (LinphoneAddress *address, const char *username) {
-	return !address->cppPtr->setUsername(L_C_TO_STRING(username));
+	return !L_GET_CPP_PTR_FROM_C_OBJECT(address)->setUsername(L_C_TO_STRING(username));
 }
 
 const char *linphone_address_get_domain (const LinphoneAddress *address) {
-	return L_STRING_TO_C(address->cppPtr->getDomain());
+	return L_STRING_TO_C(L_GET_CPP_PTR_FROM_C_OBJECT(address)->getDomain());
 }
 
 LinphoneStatus linphone_address_set_domain (LinphoneAddress *address, const char *domain) {
-	return !address->cppPtr->setDomain(L_C_TO_STRING(domain));
+	return !L_GET_CPP_PTR_FROM_C_OBJECT(address)->setDomain(L_C_TO_STRING(domain));
 }
 
 int linphone_address_get_port (const LinphoneAddress *address) {
-	return address->cppPtr->getPort();
+	return L_GET_CPP_PTR_FROM_C_OBJECT(address)->getPort();
 }
 
 LinphoneStatus linphone_address_set_port (LinphoneAddress *address, int port) {
-	return !address->cppPtr->setPort(port);
+	return !L_GET_CPP_PTR_FROM_C_OBJECT(address)->setPort(port);
 }
 
 LinphoneTransportType linphone_address_get_transport (const LinphoneAddress *address) {
-	return static_cast<LinphoneTransportType>(address->cppPtr->getTransport());
+	return static_cast<LinphoneTransportType>(L_GET_CPP_PTR_FROM_C_OBJECT(address)->getTransport());
 }
 
 LinphoneStatus linphone_address_set_transport (LinphoneAddress *address, LinphoneTransportType transport) {
-	return !address->cppPtr->setTransport(static_cast<LINPHONE_NAMESPACE::Transport>(transport));
+	return !L_GET_CPP_PTR_FROM_C_OBJECT(address)->setTransport(static_cast<LINPHONE_NAMESPACE::Transport>(transport));
 }
 
 bool_t linphone_address_get_secure (const LinphoneAddress *address) {
-	return address->cppPtr->getSecure();
+	return L_GET_CPP_PTR_FROM_C_OBJECT(address)->getSecure();
 }
 
 void linphone_address_set_secure (LinphoneAddress *address, bool_t enabled) {
-	address->cppPtr->setSecure(enabled);
+	L_GET_CPP_PTR_FROM_C_OBJECT(address)->setSecure(enabled);
 }
 
 bool_t linphone_address_is_sip (const LinphoneAddress *address) {
-	return address->cppPtr->isSip();
+	return L_GET_CPP_PTR_FROM_C_OBJECT(address)->isSip();
 }
 
 const char *linphone_address_get_method_param (const LinphoneAddress *address) {
-	return L_STRING_TO_C(address->cppPtr->getMethodParam());
+	return L_STRING_TO_C(L_GET_CPP_PTR_FROM_C_OBJECT(address)->getMethodParam());
 }
 
 void linphone_address_set_method_param (LinphoneAddress *address, const char *method_param) {
-	address->cppPtr->setMethodParam(L_C_TO_STRING(method_param));
+	L_GET_CPP_PTR_FROM_C_OBJECT(address)->setMethodParam(L_C_TO_STRING(method_param));
 }
 
 const char *linphone_address_get_password (const LinphoneAddress *address) {
-	return L_STRING_TO_C(address->cppPtr->getPassword());
+	return L_STRING_TO_C(L_GET_CPP_PTR_FROM_C_OBJECT(address)->getPassword());
 }
 
 void linphone_address_set_password (LinphoneAddress *address, const char *password) {
-	address->cppPtr->setPassword(L_C_TO_STRING(password));
+	L_GET_CPP_PTR_FROM_C_OBJECT(address)->setPassword(L_C_TO_STRING(password));
 }
 
 void linphone_address_clean (LinphoneAddress *address) {
-	address->cppPtr->clean();
+	L_GET_CPP_PTR_FROM_C_OBJECT(address)->clean();
 }
 
 char *linphone_address_as_string (const LinphoneAddress *address) {
-	return ms_strdup(address->cppPtr->asString().c_str());
+	return ms_strdup(L_GET_CPP_PTR_FROM_C_OBJECT(address)->asString().c_str());
 }
 
 char *linphone_address_as_string_uri_only (const LinphoneAddress *address) {
-	return ms_strdup(address->cppPtr->asStringUriOnly().c_str());
+	return ms_strdup(L_GET_CPP_PTR_FROM_C_OBJECT(address)->asStringUriOnly().c_str());
 }
 
 bool_t linphone_address_weak_equal (const LinphoneAddress *address1, const LinphoneAddress *address2) {
-	return address1->cppPtr->weakEqual(*address2->cppPtr);
+	return L_GET_CPP_PTR_FROM_C_OBJECT(address1)->weakEqual(*L_GET_CPP_PTR_FROM_C_OBJECT(address2));
 }
 
 bool_t linphone_address_equal (const LinphoneAddress *address1, const LinphoneAddress *address2) {
-	return *address1->cppPtr == *address2->cppPtr;
+	return *L_GET_CPP_PTR_FROM_C_OBJECT(address1) == *L_GET_CPP_PTR_FROM_C_OBJECT(address2);
 }
 
 const char *linphone_address_get_header (const LinphoneAddress *address, const char *header_name) {
-	return L_STRING_TO_C(address->cppPtr->getHeaderValue(L_C_TO_STRING(header_name)));
+	return L_STRING_TO_C(L_GET_CPP_PTR_FROM_C_OBJECT(address)->getHeaderValue(L_C_TO_STRING(header_name)));
 }
 
 void linphone_address_set_header (LinphoneAddress *address, const char *header_name, const char *header_value) {
-	address->cppPtr->setHeader(L_C_TO_STRING(header_name), L_C_TO_STRING(header_value));
+	L_GET_CPP_PTR_FROM_C_OBJECT(address)->setHeader(L_C_TO_STRING(header_name), L_C_TO_STRING(header_value));
 }
 
 bool_t linphone_address_has_param (const LinphoneAddress *address, const char *param_name) {
-	return address->cppPtr->hasParam(L_C_TO_STRING(param_name));
+	return L_GET_CPP_PTR_FROM_C_OBJECT(address)->hasParam(L_C_TO_STRING(param_name));
 }
 
 const char *linphone_address_get_param (const LinphoneAddress *address, const char *param_name) {
-	return L_STRING_TO_C(address->cppPtr->getParamValue(L_C_TO_STRING(param_name)));
+	return L_STRING_TO_C(L_GET_CPP_PTR_FROM_C_OBJECT(address)->getParamValue(L_C_TO_STRING(param_name)));
 }
 
 void linphone_address_set_param (LinphoneAddress *address, const char *param_name, const char *param_value) {
-	address->cppPtr->setParam(L_C_TO_STRING(param_name), L_C_TO_STRING(param_value));
+	L_GET_CPP_PTR_FROM_C_OBJECT(address)->setParam(L_C_TO_STRING(param_name), L_C_TO_STRING(param_value));
 }
 
 void linphone_address_set_params (LinphoneAddress *address, const char *params) {
-	address->cppPtr->setParams(L_C_TO_STRING(params));
+	L_GET_CPP_PTR_FROM_C_OBJECT(address)->setParams(L_C_TO_STRING(params));
 }
 
 bool_t linphone_address_has_uri_param (const LinphoneAddress *address, const char *uri_param_name) {
-	return address->cppPtr->hasUriParam(L_C_TO_STRING(uri_param_name));
+	return L_GET_CPP_PTR_FROM_C_OBJECT(address)->hasUriParam(L_C_TO_STRING(uri_param_name));
 }
 
 const char *linphone_address_get_uri_param (const LinphoneAddress *address, const char *uri_param_name) {
-	return L_STRING_TO_C(address->cppPtr->getUriParamValue(L_C_TO_STRING(uri_param_name)));
+	return L_STRING_TO_C(L_GET_CPP_PTR_FROM_C_OBJECT(address)->getUriParamValue(L_C_TO_STRING(uri_param_name)));
 }
 
 void linphone_address_set_uri_param (LinphoneAddress *address, const char *uri_param_name, const char *uri_param_value) {
-	address->cppPtr->setUriParam(L_C_TO_STRING(uri_param_name), L_C_TO_STRING(uri_param_value));
+	L_GET_CPP_PTR_FROM_C_OBJECT(address)->setUriParam(L_C_TO_STRING(uri_param_name), L_C_TO_STRING(uri_param_value));
 }
 
 void linphone_address_set_uri_params (LinphoneAddress *address, const char *params) {
-	address->cppPtr->setUriParams(L_C_TO_STRING(params));
+	L_GET_CPP_PTR_FROM_C_OBJECT(address)->setUriParams(L_C_TO_STRING(params));
 }
 
 void linphone_address_destroy (LinphoneAddress *address) {
@@ -189,5 +189,5 @@ void linphone_address_destroy (LinphoneAddress *address) {
 }
 
 bool_t linphone_address_is_secure (const LinphoneAddress *address) {
-	return address->cppPtr->getSecure();
+	return L_GET_CPP_PTR_FROM_C_OBJECT(address)->getSecure();
 }