diff --git a/examples/http-socket/Makefile b/examples/http-socket/Makefile
index a0d2534e3..e63dacd84 100644
--- a/examples/http-socket/Makefile
+++ b/examples/http-socket/Makefile
@@ -3,5 +3,4 @@ CONTIKI=../..
 MODULES += os/net/app-layer/http-socket
 
 CONTIKI_WITH_RPL_LITE = 0
-CFLAGS += -DUIP_CONF_TCP=1
 include $(CONTIKI)/Makefile.include
diff --git a/examples/http-socket/project-conf.h b/examples/http-socket/project-conf.h
new file mode 100644
index 000000000..38f34be86
--- /dev/null
+++ b/examples/http-socket/project-conf.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2017, George Oikonomou - http://www.spd.gr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef PROJECT_CONF_H_
+#define PROJECT_CONF_H_
+/*---------------------------------------------------------------------------*/
+#define UIP_CONF_TCP 1
+/*---------------------------------------------------------------------------*/
+#endif /* PROJECT_CONF_H_ */
diff --git a/examples/ip64-router/Makefile b/examples/ip64-router/Makefile
index 65bd6da74..a77652cfa 100644
--- a/examples/ip64-router/Makefile
+++ b/examples/ip64-router/Makefile
@@ -1,5 +1,4 @@
 all: ip64-router
 CONTIKI=../..
 
-CFLAGS += -DUIP_CONF_TCP=1
 include $(CONTIKI)/Makefile.include
diff --git a/examples/ip64-router/project-conf.h b/examples/ip64-router/project-conf.h
new file mode 100644
index 000000000..38f34be86
--- /dev/null
+++ b/examples/ip64-router/project-conf.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2017, George Oikonomou - http://www.spd.gr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef PROJECT_CONF_H_
+#define PROJECT_CONF_H_
+/*---------------------------------------------------------------------------*/
+#define UIP_CONF_TCP 1
+/*---------------------------------------------------------------------------*/
+#endif /* PROJECT_CONF_H_ */
diff --git a/examples/ipv6/rpl-border-router/Makefile b/examples/ipv6/rpl-border-router/Makefile
index 8abb62a10..c8a40f681 100644
--- a/examples/ipv6/rpl-border-router/Makefile
+++ b/examples/ipv6/rpl-border-router/Makefile
@@ -16,12 +16,10 @@ PROJECT_SOURCEFILES += slip-bridge.c
 
 WITH_WEBSERVER=1
 ifeq ($(WITH_WEBSERVER),1)
-CFLAGS += -DUIP_CONF_TCP=1
 CFLAGS += -DWEBSERVER=1
 PROJECT_SOURCEFILES += httpd-simple.c
 else ifneq ($(WITH_WEBSERVER), 0)
 MODULES += $(WITH_WEBSERVER)
-CFLAGS += -DUIP_CONF_TCP=1
 CFLAGS += -DWEBSERVER=2
 endif
 
diff --git a/examples/ipv6/rpl-border-router/project-conf.h b/examples/ipv6/rpl-border-router/project-conf.h
index fda9acd88..63930dd77 100644
--- a/examples/ipv6/rpl-border-router/project-conf.h
+++ b/examples/ipv6/rpl-border-router/project-conf.h
@@ -39,4 +39,8 @@
 #define WEBSERVER_CONF_CFS_CONNS 2
 #endif
 
+#if WEBSERVER
+#define UIP_CONF_TCP 1
+#endif
+
 #endif /* PROJECT_ROUTER_CONF_H_ */
diff --git a/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile b/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
index eb183a1cd..2ffbb46dd 100644
--- a/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
@@ -12,7 +12,6 @@ PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 
 CFLAGS += -DWITH_COAP
-CFLAGS += -DUIP_CONF_TCP=0
 MODULES += os/net/app-layer/coap
 
 include $(CONTIKI)/Makefile.include
diff --git a/examples/platform-specific/jn516x/rpl/coap-dongle-node/project-conf.h b/examples/platform-specific/jn516x/rpl/coap-dongle-node/project-conf.h
index 4c2ecd648..a46f32f1c 100644
--- a/examples/platform-specific/jn516x/rpl/coap-dongle-node/project-conf.h
+++ b/examples/platform-specific/jn516x/rpl/coap-dongle-node/project-conf.h
@@ -34,6 +34,8 @@
 #ifndef __PROJECT_CONF_H__
 #define __PROJECT_CONF_H__
 
+#define UIP_CONF_TCP 0
+
 #include "../common-conf.h"
 
 #endif /* __PROJECT_CONF_H__ */
diff --git a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
index 3da7690db..8a13078e3 100644
--- a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
@@ -12,7 +12,6 @@ PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 
 CFLAGS += -DWITH_COAP
-CFLAGS += -DUIP_CONF_TCP=0
 MODULES += os/net/app-layer/coap
 
 include $(CONTIKI)/Makefile.include
diff --git a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/project-conf.h b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/project-conf.h
index 4c2ecd648..a46f32f1c 100644
--- a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/project-conf.h
+++ b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/project-conf.h
@@ -34,6 +34,8 @@
 #ifndef __PROJECT_CONF_H__
 #define __PROJECT_CONF_H__
 
+#define UIP_CONF_TCP 0
+
 #include "../common-conf.h"
 
 #endif /* __PROJECT_CONF_H__ */
diff --git a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
index 97b61dd9c..a261e567e 100644
--- a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
@@ -12,7 +12,6 @@ PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 
 CFLAGS += -DWITH_COAP
-CFLAGS += -DUIP_CONF_TCP=0
 MODULES += os/net/app-layer/coap
 
 include $(CONTIKI)/Makefile.include
diff --git a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/project-conf.h b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/project-conf.h
index 4c2ecd648..a46f32f1c 100644
--- a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/project-conf.h
+++ b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/project-conf.h
@@ -34,6 +34,8 @@
 #ifndef __PROJECT_CONF_H__
 #define __PROJECT_CONF_H__
 
+#define UIP_CONF_TCP 0
+
 #include "../common-conf.h"
 
 #endif /* __PROJECT_CONF_H__ */
diff --git a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
index 9f06ae400..ab51e45cf 100644
--- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
@@ -9,7 +9,6 @@ PROJECTDIRS += .. ../../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
 MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/net/app-layer/coap
 MODULES += os/services/orchestra os/lib/json
diff --git a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/project-conf.h b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/project-conf.h
index 857fe3091..396fddf19 100644
--- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/project-conf.h
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/project-conf.h
@@ -37,6 +37,7 @@
 
 #include "../../common-conf.h"
 
+#define UIP_CONF_TCP 0
 #define UART_BAUD_RATE UART_RATE_115200
 
 #endif /* __PROJECT_CONF_H__ */
diff --git a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
index f5f3b009e..d8d32f4fd 100644
--- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
@@ -11,7 +11,6 @@ PROJECT_SOURCEFILES += rpl-tools.c
 
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
 MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/net/app-layer/coap
 MODULES += os/services/orchestra os/lib/json
diff --git a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/project-conf.h b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/project-conf.h
index d1db3565c..5c1982027 100644
--- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/project-conf.h
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/project-conf.h
@@ -35,6 +35,8 @@
 #define UIP_FALLBACK_INTERFACE rpl_interface
 #endif
 
+#define UIP_CONF_TCP 0
+
 /* Needed for slip-bridge */
 #define SLIP_BRIDGE_CONF_NO_PUTCHAR 0
 
diff --git a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
index 9a9cdc4f4..2d155457f 100644
--- a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
@@ -10,7 +10,6 @@ PROJECT_SOURCEFILES += rpl-tools.c
 
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
 MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/net/app-layer/coap
 MODULES += os/services/orchestra os/lib/json
diff --git a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/project-conf.h b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/project-conf.h
index cadc84854..3ca4793cf 100644
--- a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/project-conf.h
+++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/project-conf.h
@@ -36,6 +36,7 @@
 
 #include "../../common-conf.h"
 
+#define UIP_CONF_TCP 0
 #define UART_BAUD_RATE UART_RATE_115200
 
 #endif /* __PROJECT_CONF_H__ */
diff --git a/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
index 38c7a7ec2..7d0399fdf 100644
--- a/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
+++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
@@ -11,7 +11,6 @@ PROJECTDIRS += .. ../../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 
 CFLAGS += -DWITH_COAP
-CFLAGS += -DUIP_CONF_TCP=0
 MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/net/app-layer/coap
 MODULES += os/services/orchestra os/lib/json
diff --git a/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/project-conf.h b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/project-conf.h
index ca3d8096c..01c0618da 100644
--- a/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/project-conf.h
+++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/project-conf.h
@@ -40,6 +40,7 @@
 
 #include "../../common-conf.h"
 
+#define UIP_CONF_TCP 0
 #define QUEUEBUF_CONF_NUM 16
 
 #define TSCH_QUEUE_CONF_MAX_NEIGHBOR_QUEUES 8
diff --git a/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile b/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
index 22d1fdeb2..b9c4da5df 100644
--- a/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
@@ -11,7 +11,6 @@ PROJECT_SOURCEFILES += rpl-tools.c
 
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
-CFLAGS += -DUIP_CONF_TCP=0
 MAKE_MAC = MAKE_MAC_TSCH
 MODULES += os/net/app-layer/coap
 MODULES += os/services/orchestra os/lib/json
diff --git a/examples/platform-specific/jn516x/tsch/uart1-test-node/project-conf.h b/examples/platform-specific/jn516x/tsch/uart1-test-node/project-conf.h
index 98c72b61f..18ce322e5 100644
--- a/examples/platform-specific/jn516x/tsch/uart1-test-node/project-conf.h
+++ b/examples/platform-specific/jn516x/tsch/uart1-test-node/project-conf.h
@@ -36,6 +36,8 @@
 
 #include "../common-conf.h"
 
+#define UIP_CONF_TCP 0
+
 #define UART_BAUD_RATE UART_RATE_115200
 
 #define UART1_BAUD_RATE UART_RATE_115200
diff --git a/examples/platform-specific/zoul/orion/ip64-router/Makefile b/examples/platform-specific/zoul/orion/ip64-router/Makefile
index 4e184b119..8300617ca 100644
--- a/examples/platform-specific/zoul/orion/ip64-router/Makefile
+++ b/examples/platform-specific/zoul/orion/ip64-router/Makefile
@@ -6,7 +6,6 @@ CONTIKI = ../../../../..
 
 WITH_IP64 = 1
 
-DEFINES += UIP_CONF_TCP=1
 PROJECT_SOURCEFILES += httpd-simple.c
 
 include $(CONTIKI)/Makefile.include
diff --git a/examples/platform-specific/zoul/orion/ip64-router/project-conf.h b/examples/platform-specific/zoul/orion/ip64-router/project-conf.h
index 100145a80..bbec833ad 100644
--- a/examples/platform-specific/zoul/orion/ip64-router/project-conf.h
+++ b/examples/platform-specific/zoul/orion/ip64-router/project-conf.h
@@ -65,6 +65,7 @@
 #define UIP_CONF_RECEIVE_WINDOW     128
 #define WEBSERVER_CONF_CFS_CONNS    2
 #define UIP_CONF_BUFFER_SIZE        900
+#define UIP_CONF_TCP                  1
 #define UIP_CONF_TCP_MSS            128
 
 #endif /* PROJECT_CONF_H_ */