diff --git a/examples/platform-specific/jn516x/tsch/common-conf-jn516x.h b/examples/platform-specific/jn516x/tsch/common-conf-jn516x.h
index 7f837d739..568fd4b6d 100644
--- a/examples/platform-specific/jn516x/tsch/common-conf-jn516x.h
+++ b/examples/platform-specific/jn516x/tsch/common-conf-jn516x.h
@@ -49,7 +49,9 @@
 #define UIP_CONF_BUFFER_SIZE     1280 /* ipv6 required minimum */
 
 /* Queues */
+#ifndef QUEUEBUF_CONF_NUM
 #define QUEUEBUF_CONF_NUM 32
+#endif
 
 #define TSCH_QUEUE_CONF_NUM_PER_NEIGHBOR 32
 
@@ -67,6 +69,8 @@
 
 #define UART_XONXOFF_FLOW_CTRL 1
 
+#ifndef UART_BAUD_RATE
 #define UART_BAUD_RATE UART_RATE_1000000
+#endif
 
 #endif /* __COMMON_CONF_JN516X_H__ */
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 396fddf19..360fdef25 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
@@ -35,9 +35,9 @@
 #ifndef __PROJECT_CONF_H__
 #define __PROJECT_CONF_H__
 
-#include "../../common-conf.h"
-
 #define UIP_CONF_TCP 0
 #define UART_BAUD_RATE UART_RATE_115200
 
+#include "../../common-conf.h"
+
 #endif /* __PROJECT_CONF_H__ */
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 5c1982027..52f716c41 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
@@ -40,9 +40,8 @@
 /* Needed for slip-bridge */
 #define SLIP_BRIDGE_CONF_NO_PUTCHAR 0
 
-#include "../../common-conf.h"
-
 #define UART_BAUD_RATE UART_RATE_230400
 
+#include "../../common-conf.h"
 
 #endif /* PROJECT_ROUTER_CONF_H_ */
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 3ca4793cf..0394b0ad5 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
@@ -34,9 +34,9 @@
 #ifndef __PROJECT_CONF_H__
 #define __PROJECT_CONF_H__
 
-#include "../../common-conf.h"
-
 #define UIP_CONF_TCP 0
 #define UART_BAUD_RATE UART_RATE_115200
 
+#include "../../common-conf.h"
+
 #endif /* __PROJECT_CONF_H__ */
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 01c0618da..c34c364e3 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
@@ -38,11 +38,11 @@
 /* Needed for slip-bridge */
 #define SLIP_BRIDGE_CONF_NO_PUTCHAR 0
 
-#include "../../common-conf.h"
-
 #define UIP_CONF_TCP 0
 #define QUEUEBUF_CONF_NUM 16
 
 #define TSCH_QUEUE_CONF_MAX_NEIGHBOR_QUEUES 8
 
+#include "../../common-conf.h"
+
 #endif /* PROJECT_ROUTER_CONF_H_ */
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 18ce322e5..373ea0f27 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
@@ -34,8 +34,6 @@
 #ifndef __PROJECT_CONF_H__
 #define __PROJECT_CONF_H__
 
-#include "../common-conf.h"
-
 #define UIP_CONF_TCP 0
 
 #define UART_BAUD_RATE UART_RATE_115200
@@ -46,4 +44,6 @@
 
 #define UART1_CONF_RX_BUFFER_SIZE 32
 
+#include "../common-conf.h"
+
 #endif /* __PROJECT_CONF_H__ */