diff --git a/core/net/uip-ds6.h b/core/net/uip-ds6.h
index 5f0a21bc6..817542d69 100755
--- a/core/net/uip-ds6.h
+++ b/core/net/uip-ds6.h
@@ -220,9 +220,9 @@ typedef struct uip_ds6_maddr {
   uip_ipaddr_t ipaddr;
 } uip_ds6_maddr_t;
 
-/** \brief define some additional RPL related route state and 
- *  neighbor callback for RPL if RPL is defined */
-#if UIP_CONF_IPV6_RPL
+/** \brief define some additional RPL related route state and
+ *  neighbor callback for RPL - if not a DS6_ROUTE_STATE is already set */
+/* #if UIP_CONF_IPV6_RPL */
 #ifndef UIP_DS6_ROUTE_STATE_TYPE
 #define UIP_DS6_ROUTE_STATE_TYPE rpl_route_entry_t
 /* Needed for the extended route entry state when using ContikiRPL */
@@ -236,7 +236,7 @@ typedef struct rpl_route_entry {
 #ifndef UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED
 #define UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED rpl_ds6_neighbor_callback
 #endif /* UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED */
-#endif /* UIP_CONF_IPV6_RPL */
+/* #endif /\* UIP_CONF_IPV6_RPL *\/ */