diff --git a/samples/net/coap_observe_client/src/coap-observe-client.c b/samples/net/coap_observe_client/src/coap-observe-client.c
index 85e35cd6d38..26b79047f96 100644
--- a/samples/net/coap_observe_client/src/coap-observe-client.c
+++ b/samples/net/coap_observe_client/src/coap-observe-client.c
@@ -62,14 +62,12 @@ static uint8_t my_mac[] = { 0x0a, 0xbe, 0xef, 0x15, 0xf0, 0x0d };
 
 #ifdef CONFIG_NETWORKING_WITH_IPV6
 /* The 2001:db8::/32 is the private address space for documentation RFC 3849 */
-#define MY_IPADDR { { { 0x20,0x01,0x0d,0xb8,0,0,0,0,0,0,0,0,0,0,0,0x2 } } }
-
-#define PEER_IPADDR { { { 0x20,0x01,0x0d,0xb8,0,0,0,0,0,0,0,0,0,0,0,0x1 } } }
+#define PEER_IPADDR { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }
+#define MY_IPADDR { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }
 #else
 /* The 192.0.2.0/24 is the private address space for documentation RFC 5737 */
-#define MY_IPADDR { { { 192,0,2,2 } } }
-#define PEER_IPADDR { { { 192,0,2,1 } } }
-
+#define MY_IPADDR { { { 192, 0, 2, 2 } } }
+#define PEER_IPADDR { { { 192, 0, 2, 1 } } }
 #endif
 
 #define MY_PORT 8484
diff --git a/samples/net/dtls_client/src/dtls-client.c b/samples/net/dtls_client/src/dtls-client.c
index ee9763d7eec..00ad12724fd 100644
--- a/samples/net/dtls_client/src/dtls-client.c
+++ b/samples/net/dtls_client/src/dtls-client.c
@@ -91,13 +91,12 @@ static uint8_t my_mac[] = { 0x0a, 0xbe, 0xef, 0x15, 0xf0, 0x0d };
 
 #ifdef CONFIG_NETWORKING_WITH_IPV6
 /* The 2001:db8::/32 is the private address space for documentation RFC 3849 */
-#define MY_IPADDR { { { 0x20,0x01,0x0d,0xb8,0,0,0,0,0,0,0,0,0,0,0,0x2 } } }
-
-#define PEER_IPADDR { { { 0x20,0x01,0x0d,0xb8,0,0,0,0,0,0,0,0,0,0,0,0x1 } } }
+#define MY_IPADDR { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }
+#define PEER_IPADDR { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }
 #else
 /* The 192.0.2.0/24 is the private address space for documentation RFC 5737 */
-#define MY_IPADDR { { { 192,0,2,2 } } }
-#define PEER_IPADDR { { { 192,0,2,1 } } }
+#define MY_IPADDR { { { 192, 0, 2, 2 } } }
+#define PEER_IPADDR { { { 192, 0, 2, 1 } } }
 
 #endif
 #define MY_PORT 8484
diff --git a/samples/net/dtls_server/src/dtls-server.c b/samples/net/dtls_server/src/dtls-server.c
index 784270ead48..bb47a48f845 100644
--- a/samples/net/dtls_server/src/dtls-server.c
+++ b/samples/net/dtls_server/src/dtls-server.c
@@ -64,11 +64,11 @@ static uint8_t my_mac[] = { 0x0a, 0xbe, 0xef, 0x15, 0xf0, 0x0d };
 
 #ifdef CONFIG_NETWORKING_WITH_IPV6
 /* The 2001:db8::/32 is the private address space for documentation RFC 3849 */
-#define MY_IPADDR { { { 0x20,0x01,0x0d,0xb8,0,0,0,0,0,0,0,0,0,0,0,0x2 } } }
+#define MY_IPADDR { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }
 
 #else
 /* The 192.0.2.0/24 is the private address space for documentation RFC 5737 */
-#define MY_IPADDR { { { 192,0,2,2 } } }
+#define MY_IPADDR { { { 192, 0, 2, 2 } } }
 
 #endif
 #define MY_PORT 4242
diff --git a/samples/net/echo_client/src/echo-client.c b/samples/net/echo_client/src/echo-client.c
index 2b181fed393..ecb38f171ca 100644
--- a/samples/net/echo_client/src/echo-client.c
+++ b/samples/net/echo_client/src/echo-client.c
@@ -70,10 +70,11 @@ static uint8_t my_mac[] = { 0x15, 0x0a, 0xbe, 0xef, 0xf0, 0x0d };
 
 #ifdef CONFIG_NETWORKING_WITH_IPV6
 /* The 2001:db8::/32 is the private address space for documentation RFC 3849 */
-#define PEER_IPADDR { { { 0x20,0x01,0x0d,0xb8,0,0,0,0,0,0,0,0,0,0,0,0x1 } } }
-#define MY_IPADDR { { { 0x20,0x01,0x0d,0xb8,0,0,0,0,0,0,0,0,0,0,0,0x2 } } }
+#define PEER_IPADDR { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }
+#define MY_IPADDR { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }
+
 /* admin-local, dynamically allocated multicast address */
-#define MCAST_IPADDR { { { 0xff,0x84,0,0,0,0,0,0,0,0,0,0,0,0,0,0x2 } } }
+#define MCAST_IPADDR { { { 0xff, 0x84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }
 
 static const struct in6_addr in6addr_peer = PEER_IPADDR;
 static struct in6_addr in6addr_my = MY_IPADDR;
@@ -83,11 +84,11 @@ static struct in6_addr in6addr_my = MY_IPADDR;
 #error "IPv4 not supported at the moment, fix me!"
 
 /* The 192.0.2.0/24 is the private address space for documentation RFC 5737 */
-#define MY_IPADDR { { { 192,0,2,2 } } }
-#define PEER_IPADDR { { { 192,0,2,1 } } }
+#define MY_IPADDR { { { 192, 0, 2, 2 } } }
+#define PEER_IPADDR { { { 192, 0, 2, 1 } } }
 
 /* Organization-local 239.192.0.0/14 */
-#define MCAST_IPADDR { { { 239,192,0,2 } } }
+#define MCAST_IPADDR { { { 239, 192, 0, 2 } } }
 #endif /* CONFIG_NETWORKING_WITH_IPV6 */
 
 #define MY_PORT 8484
diff --git a/samples/net/echo_server/src/echo-server.c b/samples/net/echo_server/src/echo-server.c
index 12f4b2abe31..ff8f3f300e1 100644
--- a/samples/net/echo_server/src/echo-server.c
+++ b/samples/net/echo_server/src/echo-server.c
@@ -52,20 +52,20 @@ static uint8_t my_mac[] = { 0x0a, 0xbe, 0xef, 0x15, 0xf0, 0x0d };
 
 #if defined(CONFIG_NETWORKING_WITH_IPV6)
 /* The 2001:db8::/32 is the private address space for documentation RFC 3849 */
-#define MY_IPADDR { { { 0x20,0x01,0x0d,0xb8,0,0,0,0,0,0,0,0,0,0,0,0x1 } } }
-#define PEER_IPADDR { { { 0x20,0x01,0x0d,0xb8,0,0,0,0,0,0,0,0,0,0,0,0x2 } } }
+#define MY_IPADDR { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1 } } }
+#define PEER_IPADDR { { { 0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }
 
 /* admin-local, dynamically allocated multicast address */
-#define MCAST_IPADDR { { { 0xff,0x84,0,0,0,0,0,0,0,0,0,0,0,0,0,0x2 } } }
+#define MCAST_IPADDR { { { 0xff, 0x84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2 } } }
 
 static const struct in6_addr in6addr_peer = PEER_IPADDR;
 static struct in6_addr in6addr_my = MY_IPADDR;
 #else
 /* The 192.0.2.0/24 is the private address space for documentation RFC 5737 */
-#define MY_IPADDR { { { 192,0,2,2 } } }
+#define MY_IPADDR { { { 192, 0, 2, 2 } } }
 
 /* Organization-local 239.192.0.0/14 */
-#define MCAST_IPADDR { { { 239,192,0,2 } } }
+#define MCAST_IPADDR { { { 239, 192, 0, 2 } } }
 #endif
 #define MY_PORT 4242