diff --git a/CHANGELOG b/CHANGELOG
index 4f891b70..3e805dad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,10 @@ HISTORY
 
   ++ New features:
 
+  2015-09-23: Simon Goldschmidt
+  * netif.h/.c, nd6.c: task #13729: Convert netif addresses (IPv4 & IPv6) to
+    ip_addr_t (so they can be used without conversion/temporary storage)
+
   2015-09-08: Dirk Ziegelmeier
   * snmp: Separate mib2 counter/table callbacks from snmp agent. This both cleans
     up the code and should allow integration of a 3rd party agent/mib2. Simple
diff --git a/src/core/ipv6/nd6.c b/src/core/ipv6/nd6.c
index 7ae4639b..3cc65c09 100644
--- a/src/core/ipv6/nd6.c
+++ b/src/core/ipv6/nd6.c
@@ -784,7 +784,7 @@ nd6_tmr(void)
           for (j = 1; j < LWIP_IPV6_NUM_ADDRESSES; j++) {
             if (netif_ip6_addr_state(prefix_list[i].netif, j) == IP6_ADDR_INVALID) {
               /* Generate an address using this prefix and interface ID from link-local address. */
-              IP6_ADDR(&prefix_list[i].netif->ip6_addr[j],
+              IP_ADDR6(&prefix_list[i].netif->ip6_addr[j],
                 prefix_list[i].prefix.addr[0], prefix_list[i].prefix.addr[1],
                 netif_ip6_addr(prefix_list[i].netif, 0)->addr[2], netif_ip6_addr(prefix_list[i].netif, 0)->addr[3]);
 
diff --git a/src/core/netif.c b/src/core/netif.c
index e13f182d..d82b644e 100644
--- a/src/core/netif.c
+++ b/src/core/netif.c
@@ -195,13 +195,13 @@ netif_add(struct netif *netif,
 
   /* reset new interface configuration state */
 #if LWIP_IPV4
-  ip4_addr_set_zero(&netif->ip_addr);
-  ip4_addr_set_zero(&netif->netmask);
-  ip4_addr_set_zero(&netif->gw);
+  ip_addr_set_zero_ip4(&netif->ip_addr);
+  ip_addr_set_zero_ip4(&netif->netmask);
+  ip_addr_set_zero_ip4(&netif->gw);
 #endif /* LWIP_IPV4 */
 #if LWIP_IPV6
   for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-    ip6_addr_set_zero(&netif->ip6_addr[i]);
+    ip_addr_set_zero_ip6(&netif->ip6_addr[i]);
     netif_ip6_addr_set_state(netif, i, IP6_ADDR_INVALID);
   }
   netif->output_ip6 = netif_null_output_ip6;
@@ -435,7 +435,8 @@ netif_set_ipaddr(struct netif *netif, const ip4_addr_t *ipaddr)
     mib2_remove_ip4(netif);
     mib2_remove_route_ip4(0, netif);
     /* set new IP address to netif */
-    ip4_addr_set(&netif->ip_addr, ipaddr);
+    ip4_addr_set(ip_2_ip4(&netif->ip_addr), ipaddr);
+    IP_SET_TYPE_VAL(netif->ip_addr, IPADDR_TYPE_V4);
     mib2_add_ip4(netif);
     mib2_add_route_ip4(0, netif);
 
@@ -463,7 +464,8 @@ netif_set_ipaddr(struct netif *netif, const ip4_addr_t *ipaddr)
 void
 netif_set_gw(struct netif *netif, const ip4_addr_t *gw)
 {
-  ip4_addr_set(&netif->gw, gw);
+  ip4_addr_set(ip_2_ip4(&netif->gw), gw);
+  IP_SET_TYPE_VAL(netif->gw, IPADDR_TYPE_V4);
   LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("netif: GW address of interface %c%c set to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
     netif->name[0], netif->name[1],
     ip4_addr1_16(netif_ip4_gw(netif)),
@@ -486,7 +488,8 @@ netif_set_netmask(struct netif *netif, const ip4_addr_t *netmask)
 {
   mib2_remove_route_ip4(0, netif);
   /* set new netmask to netif */
-  ip4_addr_set(&netif->netmask, netmask);
+  ip4_addr_set(ip_2_ip4(&netif->netmask), netmask);
+  IP_SET_TYPE_VAL(netif->netmask, IPADDR_TYPE_V4);
   mib2_add_route_ip4(0, netif);
   LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("netif: netmask of interface %c%c set to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
     netif->name[0], netif->name[1],
@@ -918,31 +921,31 @@ netif_create_ip6_linklocal_address(struct netif *netif, u8_t from_mac_48bit)
   u8_t i, addr_index;
 
   /* Link-local prefix. */
-  netif->ip6_addr[0].addr[0] = PP_HTONL(0xfe800000ul);
-  netif->ip6_addr[0].addr[1] = 0;
+  ip_2_ip6(&netif->ip6_addr[0])->addr[0] = PP_HTONL(0xfe800000ul);
+  ip_2_ip6(&netif->ip6_addr[0])->addr[1] = 0;
 
   /* Generate interface ID. */
   if (from_mac_48bit) {
     /* Assume hwaddr is a 48-bit IEEE 802 MAC. Convert to EUI-64 address. Complement Group bit. */
-    netif->ip6_addr[0].addr[2] = htonl((((u32_t)(netif->hwaddr[0] ^ 0x02)) << 24) |
+    ip_2_ip6(&netif->ip6_addr[0])->addr[2] = htonl((((u32_t)(netif->hwaddr[0] ^ 0x02)) << 24) |
         ((u32_t)(netif->hwaddr[1]) << 16) |
         ((u32_t)(netif->hwaddr[2]) << 8) |
         (0xff));
-    netif->ip6_addr[0].addr[3] = htonl((0xfeul << 24) |
+    ip_2_ip6(&netif->ip6_addr[0])->addr[3] = htonl((0xfeul << 24) |
         ((u32_t)(netif->hwaddr[3]) << 16) |
         ((u32_t)(netif->hwaddr[4]) << 8) |
         (netif->hwaddr[5]));
   } else {
     /* Use hwaddr directly as interface ID. */
-    netif->ip6_addr[0].addr[2] = 0;
-    netif->ip6_addr[0].addr[3] = 0;
+    ip_2_ip6(&netif->ip6_addr[0])->addr[2] = 0;
+    ip_2_ip6(&netif->ip6_addr[0])->addr[3] = 0;
 
     addr_index = 3;
     for (i = 0; (i < 8) && (i < netif->hwaddr_len); i++) {
       if (i == 4) {
         addr_index--;
       }
-      netif->ip6_addr[0].addr[addr_index] |= ((u32_t)(netif->hwaddr[netif->hwaddr_len - i - 1])) << (8 * (i & 0x03));
+      ip_2_ip6(&netif->ip6_addr[0])->addr[addr_index] |= ((u32_t)(netif->hwaddr[netif->hwaddr_len - i - 1])) << (8 * (i & 0x03));
     }
   }
 
@@ -981,7 +984,7 @@ netif_add_ip6_address(struct netif *netif, ip6_addr_t *ip6addr, s8_t *chosen_idx
   /* Find a free slot -- musn't be the first one (reserved for link local) */
   for (i = 1; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
     if (!ip6_addr_isvalid(netif->ip6_addr_state[i])) {
-      ip6_addr_copy(netif->ip6_addr[i], *ip6addr);
+      ip_addr_copy_from_ip6(netif->ip6_addr[i], *ip6addr);
       netif_ip6_addr_set_state(netif, i, IP6_ADDR_TENTATIVE);
       if (chosen_idx != NULL) {
         *chosen_idx = i;
diff --git a/src/include/lwip/netif.h b/src/include/lwip/netif.h
index 9200b6c0..02708856 100644
--- a/src/include/lwip/netif.h
+++ b/src/include/lwip/netif.h
@@ -39,7 +39,6 @@
 #include "lwip/err.h"
 
 #include "lwip/ip_addr.h"
-#include "lwip/ip6_addr.h"
 
 #include "lwip/def.h"
 #include "lwip/pbuf.h"
@@ -184,13 +183,13 @@ struct netif {
 
 #if LWIP_IPV4
   /** IP address configuration in network byte order */
-  ip4_addr_t ip_addr;
-  ip4_addr_t netmask;
-  ip4_addr_t gw;
+  ip_addr_t ip_addr;
+  ip_addr_t netmask;
+  ip_addr_t gw;
 #endif /* LWIP_IPV4 */
 #if LWIP_IPV6
   /** Array of IPv6 addresses for this netif. */
-  ip6_addr_t ip6_addr[LWIP_IPV6_NUM_ADDRESSES];
+  ip_addr_t ip6_addr[LWIP_IPV6_NUM_ADDRESSES];
   /** The state of each IPv6 address (Tentative, Preferred, etc).
    * @see ip6_addr.h */
   u8_t ip6_addr_state[LWIP_IPV6_NUM_ADDRESSES];
@@ -349,9 +348,9 @@ void netif_set_default(struct netif *netif);
 void netif_set_ipaddr(struct netif *netif, const ip4_addr_t *ipaddr);
 void netif_set_netmask(struct netif *netif, const ip4_addr_t *netmask);
 void netif_set_gw(struct netif *netif, const ip4_addr_t *gw);
-#define netif_ip4_addr(netif)    ((const ip4_addr_t*)&((netif)->ip_addr))
-#define netif_ip4_netmask(netif) ((const ip4_addr_t*)&((netif)->netmask))
-#define netif_ip4_gw(netif)      ((const ip4_addr_t*)&((netif)->gw))
+#define netif_ip4_addr(netif)    (ip_2_ip4_c(&((netif)->ip_addr)))
+#define netif_ip4_netmask(netif) (ip_2_ip4_c(&((netif)->netmask)))
+#define netif_ip4_gw(netif)      (ip_2_ip4_c(&((netif)->gw)))
 #endif /* LWIP_IPV4 */
 
 void netif_set_up(struct netif *netif);
@@ -399,10 +398,10 @@ void netif_poll_all(void);
 #endif /* ENABLE_LOOPBACK */
 
 #if LWIP_IPV6
-#define netif_ip6_addr(netif, i)  (&((netif)->ip6_addr[(i)]))
-#define netif_ip6_addr_set(netif, i, addr6) ip6_addr_set(&((netif)->ip6_addr[(i)]), addr6)
-#define netif_ip6_addr_state(netif, i)  ((netif)->ip6_addr_state[(i)])
-#define netif_ip6_addr_set_state(netif, i, state)  ((netif)->ip6_addr_state[(i)] = (state))
+#define netif_ip6_addr(netif, i)  (ip_2_ip6_c(&((netif)->ip6_addr[i])))
+#define netif_ip6_addr_set(netif, i, addr6) do { ip6_addr_set(ip_2_ip6(&((netif)->ip6_addr[i])), addr6); IP_SET_TYPE_VAL((netif)->ip6_addr[i], IPADDR_TYPE_V6); } while(0)
+#define netif_ip6_addr_state(netif, i)  ((netif)->ip6_addr_state[i])
+#define netif_ip6_addr_set_state(netif, i, state)  ((netif)->ip6_addr_state[i] = (state))
 s8_t netif_get_ip6_addr_match(struct netif *netif, ip6_addr_t *ip6addr);
 void netif_create_ip6_linklocal_address(struct netif *netif, u8_t from_mac_48bit);
 err_t netif_add_ip6_address(struct netif *netif, ip6_addr_t *ip6addr, s8_t *chosen_idx);