diff --git a/Makefile.include b/Makefile.include
index 79d3d5f4c..bc3d14668 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -88,10 +88,16 @@ endif
 ifeq ($(CONTIKI_WITH_IPV6),1)
   CFLAGS += -DNETSTACK_CONF_WITH_IPV6=1
   ifneq ($(CONTIKI_WITH_RPL),0)
+  	CONTIKI_WITH_RPL = 1
+  endif
+  MODULES += core/net/ipv6 core/net/ip
+endif
+
+ifeq ($(CONTIKI_WITH_RPL),1)
     CFLAGS += -DUIP_CONF_IPV6_RPL=1
     MODULES += core/net/rpl
-  endif # UIP_CONF_RPL
-  MODULES += core/net/ipv6 core/net/ip
+else
+    CFLAGS += -DUIP_CONF_IPV6_RPL=0
 endif
 
 CONTIKI_SOURCEFILES += $(CONTIKIFILES)
diff --git a/core/net/ip/tcpip.c b/core/net/ip/tcpip.c
index cdbec8f3f..6f2744785 100644
--- a/core/net/ip/tcpip.c
+++ b/core/net/ip/tcpip.c
@@ -616,7 +616,7 @@ tcpip_ipv6_output(void)
 
             rpl_repair_root(instance->instance_id);
           }
-#endif /* UIP_CONF_RPL */
+#endif /* UIP_CONF_IPV6_RPL */
           uip_ds6_route_rm(route);
 
           /* We don't have a nexthop to send the packet to, so we drop
diff --git a/examples/er-rest-example/Makefile b/examples/er-rest-example/Makefile
index 51baf8b64..a20d814ee 100644
--- a/examples/er-rest-example/Makefile
+++ b/examples/er-rest-example/Makefile
@@ -41,7 +41,7 @@ ${info INFO: er-example compiling with large buffers}
 CFLAGS += -DUIP_CONF_BUFFER_SIZE=1300
 CFLAGS += -DREST_MAX_CHUNK_SIZE=1024
 CFLAGS += -DCOAP_MAX_HEADER_SIZE=176
-UIP_CONF_RPL=0
+CONTIKI_WITH_RPL=0
 endif
 
 # optional rules to get assembly
diff --git a/examples/ipv6/multicast/project-conf.h b/examples/ipv6/multicast/project-conf.h
index 84686ce21..8df6d01b4 100644
--- a/examples/ipv6/multicast/project-conf.h
+++ b/examples/ipv6/multicast/project-conf.h
@@ -52,7 +52,6 @@
 #undef UIP_CONF_IPV6_RPL
 #undef UIP_CONF_ND6_SEND_RA
 #undef UIP_CONF_ROUTER
-#define UIP_CONF_IPV6_RPL            1
 #define UIP_CONF_ND6_SEND_RA         0
 #define UIP_CONF_ROUTER              1
 #define UIP_MCAST6_ROUTE_CONF_ROUTES 1
diff --git a/platform/avr-raven/contiki-conf.h b/platform/avr-raven/contiki-conf.h
index b54d69031..40469aa21 100644
--- a/platform/avr-raven/contiki-conf.h
+++ b/platform/avr-raven/contiki-conf.h
@@ -162,7 +162,6 @@ typedef unsigned short uip_stats_t;
 #define UIP_CONF_ICMP6            1
 #define UIP_CONF_UDP              1
 #define UIP_CONF_TCP              1
-//#define UIP_CONF_IPV6_RPL         0
 #define NETSTACK_CONF_NETWORK       sicslowpan_driver
 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
 #else
diff --git a/platform/avr-ravenusb/contiki-conf.h b/platform/avr-ravenusb/contiki-conf.h
index f7b31f265..03001d02a 100644
--- a/platform/avr-ravenusb/contiki-conf.h
+++ b/platform/avr-ravenusb/contiki-conf.h
@@ -222,7 +222,6 @@ extern void mac_log_802_15_4_rx(const uint8_t* buffer, size_t total_len);
 #define UIP_CONF_ICMP6           1
 #define UIP_CONF_UDP             1
 #define UIP_CONF_TCP             0
-//#define UIP_CONF_IPV6_RPL        0
 #define NETSTACK_CONF_NETWORK       sicslowpan_driver
 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
 #else
@@ -380,7 +379,6 @@ typedef unsigned short uip_stats_t;
 //#pragma mark RPL Settings
 /* ************************************************************************** */
 
-#define UIP_CONF_IPV6_RPL        0
 #if UIP_CONF_IPV6_RPL
 
 /* Not completely working yet. Works on Ubuntu after $ifconfig usb0 -arp to drop the neighbor solitications */
diff --git a/platform/cc2538dk/contiki-conf.h b/platform/cc2538dk/contiki-conf.h
index 6dac99a1e..20cee3614 100644
--- a/platform/cc2538dk/contiki-conf.h
+++ b/platform/cc2538dk/contiki-conf.h
@@ -445,10 +445,6 @@ typedef uint32_t rtimer_clock_t;
 #define UIP_CONF_ROUTER                      1
 #endif
 
-#ifndef UIP_CONF_IPV6_RPL
-#define UIP_CONF_IPV6_RPL                    1
-#endif
-
 #define UIP_CONF_ND6_SEND_RA                 0
 #define UIP_CONF_IP_FORWARD                  0
 #define RPL_CONF_STATS                       0
diff --git a/platform/cooja/Makefile.cooja b/platform/cooja/Makefile.cooja
index b6e07f34f..574def7c7 100644
--- a/platform/cooja/Makefile.cooja
+++ b/platform/cooja/Makefile.cooja
@@ -98,5 +98,5 @@ ifeq ($(CONTIKI_WITH_IPV6),1)
   CFLAGS += -DNETSTACK_CONF_WITH_IPV6=1
   ifneq ($(CONTIKI_WITH_RPL),0)
     CFLAGS += -DUIP_CONF_IPV6_RPL=1
-  endif # UIP_CONF_RPL
+  endif
 endif
diff --git a/platform/cooja/contiki-conf.h b/platform/cooja/contiki-conf.h
index 446f6f118..d6601bdca 100644
--- a/platform/cooja/contiki-conf.h
+++ b/platform/cooja/contiki-conf.h
@@ -124,9 +124,6 @@
 #define UIP_CONF_LLH_LEN            0
 
 #define UIP_CONF_ROUTER             1
-#ifndef UIP_CONF_IPV6_RPL
-#define UIP_CONF_IPV6_RPL           1
-#endif /* UIP_CONF_IPV6_RPL */
 
 /* configure number of neighbors and routes */
 #ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
diff --git a/platform/econotag/contiki-conf.h b/platform/econotag/contiki-conf.h
index 2f4d47606..871145f20 100644
--- a/platform/econotag/contiki-conf.h
+++ b/platform/econotag/contiki-conf.h
@@ -180,10 +180,6 @@
 #define UIP_CONF_ROUTER                 1  
 #endif
 
-#ifndef UIP_CONF_IPV6_RPL
-#define UIP_CONF_IPV6_RPL               1
-#endif
-
 #define NBR_TABLE_CONF_MAX_NEIGHBORS     30
 #define UIP_CONF_MAX_ROUTES   30
 
diff --git a/platform/ev-aducrf101mkxz/contiki-conf.h b/platform/ev-aducrf101mkxz/contiki-conf.h
index c71b95d34..c0df15b8a 100644
--- a/platform/ev-aducrf101mkxz/contiki-conf.h
+++ b/platform/ev-aducrf101mkxz/contiki-conf.h
@@ -127,10 +127,6 @@
 #define UIP_CONF_ROUTER                 1
 #endif
 
-#ifndef UIP_CONF_IPV6_RPL
-#define UIP_CONF_IPV6_RPL               1
-#endif
-
 #define NBR_TABLE_CONF_MAX_NEIGHBORS    16
 #define UIP_CONF_MAX_ROUTES             16
 
diff --git a/platform/eval-adf7xxxmb4z/contiki-conf.h b/platform/eval-adf7xxxmb4z/contiki-conf.h
index 910df33f2..e983d7eba 100644
--- a/platform/eval-adf7xxxmb4z/contiki-conf.h
+++ b/platform/eval-adf7xxxmb4z/contiki-conf.h
@@ -130,10 +130,6 @@
 #define UIP_CONF_ROUTER                 1
 #endif
 
-#ifndef UIP_CONF_IPV6_RPL
-#define UIP_CONF_IPV6_RPL               1
-#endif
-
 #define NBR_TABLE_CONF_MAX_NEIGHBORS     30
 #define UIP_CONF_MAX_ROUTES   30
 
diff --git a/platform/exp5438/contiki-conf.h b/platform/exp5438/contiki-conf.h
index 17017c6c1..ff23e07a6 100644
--- a/platform/exp5438/contiki-conf.h
+++ b/platform/exp5438/contiki-conf.h
@@ -143,9 +143,6 @@
 #define UIP_CONF_LLH_LEN                0
 
 #define UIP_CONF_ROUTER                 1
-#ifndef UIP_CONF_IPV6_RPL
-#define UIP_CONF_IPV6_RPL               1
-#endif /* UIP_CONF_IPV6_RPL */
 
 /* configure number of neighbors and routes */
 #ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
diff --git a/platform/mbxxx/contiki-conf.h b/platform/mbxxx/contiki-conf.h
index 8590ea006..5ad8a505e 100644
--- a/platform/mbxxx/contiki-conf.h
+++ b/platform/mbxxx/contiki-conf.h
@@ -135,7 +135,6 @@
 #endif /* WITH_COAP */
 
 #define UIP_CONF_ROUTER						1
-#define UIP_CONF_IPV6_RPL					1
 #define UIP_CONF_ND6_SEND_RA					0
 
 #define NETSTACK_CONF_WITH_IPV6						1
diff --git a/platform/micaz/contiki-conf.h b/platform/micaz/contiki-conf.h
index 5a9e7f794..25d191540 100644
--- a/platform/micaz/contiki-conf.h
+++ b/platform/micaz/contiki-conf.h
@@ -123,7 +123,6 @@
 #define UIP_CONF_LLH_LEN                0
 
 #define UIP_CONF_ROUTER                 0
-#define UIP_CONF_IPV6_RPL               1
 
 /* configure number of neighbors and routes */
 #define NBR_TABLE_CONF_MAX_NEIGHBORS     5
diff --git a/platform/minimal-net/contiki-conf.h b/platform/minimal-net/contiki-conf.h
index 67fdebc1d..1501b1384 100644
--- a/platform/minimal-net/contiki-conf.h
+++ b/platform/minimal-net/contiki-conf.h
@@ -89,7 +89,6 @@ typedef unsigned short uip_stats_t;
 #define WEBSERVER_CONF_STATUSPAGE   1
 
 /* RPL currently works only on Windows. *nix would require converting the tun interface to two pcap tees. */ 
-//#define UIP_CONF_IPV6_RPL           0
 //#define RPL_BORDER_ROUTER           0
 #endif   
 
diff --git a/platform/native/contiki-conf.h b/platform/native/contiki-conf.h
index 192dd20e8..48e623266 100644
--- a/platform/native/contiki-conf.h
+++ b/platform/native/contiki-conf.h
@@ -102,9 +102,6 @@ typedef unsigned short uip_stats_t;
 #define NETSTACK_CONF_NETWORK sicslowpan_driver
 
 #define UIP_CONF_ROUTER                 1
-#ifndef UIP_CONF_IPV6_RPL
-#define UIP_CONF_IPV6_RPL               1
-#endif /* UIP_CONF_IPV6_RPL */
 
 #define SICSLOWPAN_CONF_COMPRESSION_IPV6        0
 #define SICSLOWPAN_CONF_COMPRESSION_HC1         1
diff --git a/platform/seedeye/contiki-conf.h b/platform/seedeye/contiki-conf.h
index ccd1d8c68..69c788381 100644
--- a/platform/seedeye/contiki-conf.h
+++ b/platform/seedeye/contiki-conf.h
@@ -89,9 +89,6 @@ typedef uint32_t rtimer_clock_t;
 
 #ifdef NETSTACK_CONF_WITH_IPV6
 #define UIP_CONF_ROUTER                         1
-#ifndef UIP_CONF_IPV6_RPL
-#define UIP_CONF_IPV6_RPL                       1
-#endif /* UIP_CONF_IPV6_RPL */
 
 /* IPv6 configuration options */
 #define NETSTACK_CONF_WITH_IPV6                           1
diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h
index 2e767bd74..0340a993b 100644
--- a/platform/sky/contiki-conf.h
+++ b/platform/sky/contiki-conf.h
@@ -143,9 +143,6 @@
 #define UIP_CONF_LLH_LEN                0
 
 #define UIP_CONF_ROUTER                 1
-#ifndef UIP_CONF_IPV6_RPL
-#define UIP_CONF_IPV6_RPL               1
-#endif /* UIP_CONF_IPV6_RPL */
 
 /* configure number of neighbors and routes */
 #ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
diff --git a/platform/wismote/contiki-conf.h b/platform/wismote/contiki-conf.h
index eaf0ad3b3..adcb37c1a 100644
--- a/platform/wismote/contiki-conf.h
+++ b/platform/wismote/contiki-conf.h
@@ -127,9 +127,6 @@
 #define UIP_CONF_LLH_LEN                0
 
 #define UIP_CONF_ROUTER                 1
-#ifndef UIP_CONF_IPV6_RPL
-#define UIP_CONF_IPV6_RPL               1
-#endif /* UIP_CONF_IPV6_RPL */
 
 /* configure number of neighbors and routes */
 #ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
diff --git a/platform/z1/contiki-conf.h b/platform/z1/contiki-conf.h
index d4422783b..34fd48dde 100644
--- a/platform/z1/contiki-conf.h
+++ b/platform/z1/contiki-conf.h
@@ -138,7 +138,6 @@
 #define UIP_CONF_LLH_LEN                0
 
 #define UIP_CONF_ROUTER                 1
-#define UIP_CONF_IPV6_RPL               1
 
 /* Handle 10 neighbors */
 #define NBR_TABLE_CONF_MAX_NEIGHBORS     15