diff --git a/arch/cpu/msp430/uip-ipchksum.c b/arch/cpu/msp430/uip-ipchksum.c
index e4cb308d0..442c154dc 100644
--- a/arch/cpu/msp430/uip-ipchksum.c
+++ b/arch/cpu/msp430/uip-ipchksum.c
@@ -51,7 +51,7 @@ uint16_t
 uip_ipchksum(void)
 {
   /* Assumes proper alignement of uip_buf. */
-  uint16_t *p = (uint16_t *)&uip_buf[UIP_LLH_LEN];
+  uint16_t *p = (uint16_t *)UIP_IP_BUF;
   register uint16_t sum;
 
   sum = p[0];
diff --git a/os/net/app-layer/coap/coap-uip.c b/os/net/app-layer/coap/coap-uip.c
index 3c9347bc6..2435b9d2d 100644
--- a/os/net/app-layer/coap/coap-uip.c
+++ b/os/net/app-layer/coap/coap-uip.c
@@ -77,9 +77,6 @@
 #define SERVER_LISTEN_PORT        UIP_HTONS(COAP_DEFAULT_PORT)
 #define SERVER_LISTEN_SECURE_PORT UIP_HTONS(COAP_DEFAULT_SECURE_PORT)
 
-/* direct access into the buffer */
-#define UIP_UDP_BUF  ((struct uip_udp_hdr *)&uip_buf[uip_l2_l3_hdr_len])
-
 #ifdef WITH_DTLS
 static dtls_handler_t cb;
 static dtls_context_t *dtls_context = NULL;
diff --git a/os/net/ipv6/uip-icmp6.c b/os/net/ipv6/uip-icmp6.c
index 193c02aa4..de9cc2394 100644
--- a/os/net/ipv6/uip-icmp6.c
+++ b/os/net/ipv6/uip-icmp6.c
@@ -53,7 +53,7 @@
 #define LOG_MODULE "ICMPv6"
 #define LOG_LEVEL LOG_LEVEL_IPV6
 
-#define UIP_ICMP6_ERROR_BUF  ((struct uip_icmp6_error *)&uip_buf[uip_l2_l3_icmp_hdr_len])
+#define UIP_ICMP6_ERROR_BUF  ((struct uip_icmp6_error *)UIP_ICMP_PAYLOAD)
 #define UIP_EXT_BUF              ((struct uip_ext_hdr *)&uip_buf[uip_l2_l3_hdr_len])
 #define UIP_FIRST_EXT_BUF        ((struct uip_ext_hdr *)&uip_buf[UIP_LLIPH_LEN])
 
diff --git a/os/net/ipv6/uip-nd6.c b/os/net/ipv6/uip-nd6.c
index b2a17ff1d..446ad8346 100644
--- a/os/net/ipv6/uip-nd6.c
+++ b/os/net/ipv6/uip-nd6.c
@@ -95,10 +95,10 @@
  */
 
 /**@{  Pointers to messages just after icmp header */
-#define UIP_ND6_RS_BUF            ((uip_nd6_rs *)&uip_buf[uip_l2_l3_icmp_hdr_len])
-#define UIP_ND6_RA_BUF            ((uip_nd6_ra *)&uip_buf[uip_l2_l3_icmp_hdr_len])
-#define UIP_ND6_NS_BUF            ((uip_nd6_ns *)&uip_buf[uip_l2_l3_icmp_hdr_len])
-#define UIP_ND6_NA_BUF            ((uip_nd6_na *)&uip_buf[uip_l2_l3_icmp_hdr_len])
+#define UIP_ND6_RS_BUF            ((uip_nd6_rs *)UIP_ICMP_PAYLOAD)
+#define UIP_ND6_RA_BUF            ((uip_nd6_ra *)UIP_ICMP_PAYLOAD)
+#define UIP_ND6_NS_BUF            ((uip_nd6_ns *)UIP_ICMP_PAYLOAD)
+#define UIP_ND6_NA_BUF            ((uip_nd6_na *)UIP_ICMP_PAYLOAD)
 /** @} */
 /** Pointer to ND option */
 #define UIP_ND6_OPT_HDR_BUF  ((uip_nd6_opt_hdr *)&uip_buf[uip_l2_l3_icmp_hdr_len + nd6_opt_offset])