diff --git a/examples/rpl-border-router/common/httpd-simple.c b/examples/rpl-border-router/common/httpd-simple.c
index dbe1ac80f..d8ce76816 100644
--- a/examples/rpl-border-router/common/httpd-simple.c
+++ b/examples/rpl-border-router/common/httpd-simple.c
@@ -37,14 +37,11 @@
  *         Joakim Eriksson <joakime@sics.se>
  */
 
-#include <stdio.h>
-#include <string.h>
-
+#include "contiki.h"
 #include "contiki-net.h"
 
-#if UIP_CONF_TCP == 0
-#error HTTP server needs TCP enabled
-#endif
+#include <stdio.h>
+#include <string.h>
 
 #include "httpd-simple.h"
 #define webserver_log_file(...)
diff --git a/examples/rpl-border-router/common/webserver.c b/examples/rpl-border-router/common/webserver.c
index 00adddb7c..61be96086 100644
--- a/examples/rpl-border-router/common/webserver.c
+++ b/examples/rpl-border-router/common/webserver.c
@@ -310,7 +310,6 @@ PT_THREAD(generate_routes(struct httpd_state *s))
 
   PSOCK_END(&s->sout);
 }
-#if BORDER_ROUTER_CONF_WEBSERVER
 /*---------------------------------------------------------------------------*/
 PROCESS(webserver_nogui_process, "Web server");
 PROCESS_THREAD(webserver_nogui_process, ev, data)
@@ -332,4 +331,4 @@ httpd_simple_get_script(const char *name)
 {
   return generate_routes;
 }
-#endif /* BORDER_ROUTER_CONF_WEBSERVER */
+/*---------------------------------------------------------------------------*/
diff --git a/examples/rpl-border-router/embedded/project-conf.h b/examples/rpl-border-router/embedded/project-conf.h
index b67d39e56..30ef25b90 100644
--- a/examples/rpl-border-router/embedded/project-conf.h
+++ b/examples/rpl-border-router/embedded/project-conf.h
@@ -44,7 +44,9 @@
 #define WEBSERVER_CONF_CFS_CONNS 2
 #endif
 
+#ifndef BORDER_ROUTER_CONF_WEBSERVER
 #define BORDER_ROUTER_CONF_WEBSERVER 1
+#endif
 
 #if BORDER_ROUTER_CONF_WEBSERVER
 #define UIP_CONF_TCP 1