diff --git a/arch/arm/include/a1x/a10_irq.h b/arch/arm/include/a1x/a10_irq.h
index bb42692988b..a5777d2faf3 100644
--- a/arch/arm/include/a1x/a10_irq.h
+++ b/arch/arm/include/a1x/a10_irq.h
@@ -207,7 +207,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/a1x/irq.h b/arch/arm/include/a1x/irq.h
index b799d7b4098..33fed49d240 100644
--- a/arch/arm/include/a1x/irq.h
+++ b/arch/arm/include/a1x/irq.h
@@ -71,7 +71,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/arch.h b/arch/arm/include/arch.h
index fee37f167bf..f4cae2e5b3d 100644
--- a/arch/arm/include/arch.h
+++ b/arch/arm/include/arch.h
@@ -196,7 +196,8 @@ typedef struct save_addrenv_s save_addrenv_t;
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/arm/irq.h b/arch/arm/include/arm/irq.h
index 9f459283dd6..6edae979e75 100644
--- a/arch/arm/include/arm/irq.h
+++ b/arch/arm/include/arm/irq.h
@@ -216,7 +216,8 @@ static inline void irqrestore(irqstate_t flags)
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/armv6-m/irq.h b/arch/arm/include/armv6-m/irq.h
index 05bff9df661..6aedf6e592d 100644
--- a/arch/arm/include/armv6-m/irq.h
+++ b/arch/arm/include/armv6-m/irq.h
@@ -362,7 +362,8 @@ static inline void setcontrol(uint32_t control)
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/armv6-m/syscall.h b/arch/arm/include/armv6-m/syscall.h
index a7ca476123f..6126ee96fc1 100644
--- a/arch/arm/include/armv6-m/syscall.h
+++ b/arch/arm/include/armv6-m/syscall.h
@@ -251,7 +251,8 @@ static inline uintptr_t sys_call6(unsigned int nbr, uintptr_t parm1,
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/armv7-a/syscall.h b/arch/arm/include/armv7-a/syscall.h
index 42028bf3c8f..887d271dd8b 100644
--- a/arch/arm/include/armv7-a/syscall.h
+++ b/arch/arm/include/armv7-a/syscall.h
@@ -228,7 +228,8 @@ static inline uintptr_t sys_call6(unsigned int nbr, uintptr_t parm1,
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/armv7-m/irq.h b/arch/arm/include/armv7-m/irq.h
index bd12bcf0971..3c0cb14175d 100644
--- a/arch/arm/include/armv7-m/irq.h
+++ b/arch/arm/include/armv7-m/irq.h
@@ -378,7 +378,8 @@ static inline void setcontrol(uint32_t control)
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/armv7-m/syscall.h b/arch/arm/include/armv7-m/syscall.h
index bb2fb6fd351..4babf663a34 100644
--- a/arch/arm/include/armv7-m/syscall.h
+++ b/arch/arm/include/armv7-m/syscall.h
@@ -251,7 +251,8 @@ static inline uintptr_t sys_call6(unsigned int nbr, uintptr_t parm1,
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/c5471/irq.h b/arch/arm/include/c5471/irq.h
index 51892009b8f..e147422ad91 100644
--- a/arch/arm/include/c5471/irq.h
+++ b/arch/arm/include/c5471/irq.h
@@ -90,7 +90,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/dm320/irq.h b/arch/arm/include/dm320/irq.h
index 12586f1b53c..e2c75107549 100644
--- a/arch/arm/include/dm320/irq.h
+++ b/arch/arm/include/dm320/irq.h
@@ -119,7 +119,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/imx/irq.h b/arch/arm/include/imx/irq.h
index b90e0d5010e..05f4b2443c3 100644
--- a/arch/arm/include/imx/irq.h
+++ b/arch/arm/include/imx/irq.h
@@ -149,7 +149,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/irq.h b/arch/arm/include/irq.h
index d4d1ac389ed..137327f2cd2 100644
--- a/arch/arm/include/irq.h
+++ b/arch/arm/include/irq.h
@@ -90,7 +90,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/kl/irq.h b/arch/arm/include/kl/irq.h
index 73eed1dcbe2..27ba8575f52 100644
--- a/arch/arm/include/kl/irq.h
+++ b/arch/arm/include/kl/irq.h
@@ -192,7 +192,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/lpc31xx/irq.h b/arch/arm/include/lpc31xx/irq.h
index 71c438d201f..20a1c0aad8f 100644
--- a/arch/arm/include/lpc31xx/irq.h
+++ b/arch/arm/include/lpc31xx/irq.h
@@ -103,7 +103,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/lpc43xx/irq.h b/arch/arm/include/lpc43xx/irq.h
index 88b83390f5a..b544bb69529 100644
--- a/arch/arm/include/lpc43xx/irq.h
+++ b/arch/arm/include/lpc43xx/irq.h
@@ -211,7 +211,8 @@ typedef void (*vic_vector_t)(uint32_t *regs);
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/nuc1xx/chip.h b/arch/arm/include/nuc1xx/chip.h
index 6a7e6e0879a..51f184f2488 100644
--- a/arch/arm/include/nuc1xx/chip.h
+++ b/arch/arm/include/nuc1xx/chip.h
@@ -657,7 +657,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/nuc1xx/irq.h b/arch/arm/include/nuc1xx/irq.h
index 4c2eea2676c..0db0379d1b4 100644
--- a/arch/arm/include/nuc1xx/irq.h
+++ b/arch/arm/include/nuc1xx/irq.h
@@ -90,7 +90,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/nuc1xx/nuc120_irq.h b/arch/arm/include/nuc1xx/nuc120_irq.h
index 61a53309448..5310b2cd8ec 100644
--- a/arch/arm/include/nuc1xx/nuc120_irq.h
+++ b/arch/arm/include/nuc1xx/nuc120_irq.h
@@ -96,7 +96,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/sam34/irq.h b/arch/arm/include/sam34/irq.h
index b6581759df0..521cd5a93cd 100644
--- a/arch/arm/include/sam34/irq.h
+++ b/arch/arm/include/sam34/irq.h
@@ -104,7 +104,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/sam34/sam3u_irq.h b/arch/arm/include/sam34/sam3u_irq.h
index fcd7680b19d..25993c8d2a9 100644
--- a/arch/arm/include/sam34/sam3u_irq.h
+++ b/arch/arm/include/sam34/sam3u_irq.h
@@ -261,7 +261,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/sam34/sam3x_irq.h b/arch/arm/include/sam34/sam3x_irq.h
index 22766637ef3..d23830102d0 100644
--- a/arch/arm/include/sam34/sam3x_irq.h
+++ b/arch/arm/include/sam34/sam3x_irq.h
@@ -416,7 +416,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/sam34/sam4e_irq.h b/arch/arm/include/sam34/sam4e_irq.h
index b59d3ec9596..2a03b2217b8 100644
--- a/arch/arm/include/sam34/sam4e_irq.h
+++ b/arch/arm/include/sam34/sam4e_irq.h
@@ -324,7 +324,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/sam34/sam4l_irq.h b/arch/arm/include/sam34/sam4l_irq.h
index af86080554d..95d97773010 100644
--- a/arch/arm/include/sam34/sam4l_irq.h
+++ b/arch/arm/include/sam34/sam4l_irq.h
@@ -322,7 +322,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/sam34/sam4s_irq.h b/arch/arm/include/sam34/sam4s_irq.h
index d643bbd1ba5..79c447a9253 100644
--- a/arch/arm/include/sam34/sam4s_irq.h
+++ b/arch/arm/include/sam34/sam4s_irq.h
@@ -272,7 +272,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/sama5/sama5d3_irq.h b/arch/arm/include/sama5/sama5d3_irq.h
index 8a70bdf27b0..c198b79ebdf 100644
--- a/arch/arm/include/sama5/sama5d3_irq.h
+++ b/arch/arm/include/sama5/sama5d3_irq.h
@@ -381,7 +381,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/sama5/sama5d4_irq.h b/arch/arm/include/sama5/sama5d4_irq.h
index a0875701897..282fae32616 100644
--- a/arch/arm/include/sama5/sama5d4_irq.h
+++ b/arch/arm/include/sama5/sama5d4_irq.h
@@ -424,7 +424,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/samdl/samd20_irq.h b/arch/arm/include/samdl/samd20_irq.h
index 9cf6bd7b439..5042655d265 100644
--- a/arch/arm/include/samdl/samd20_irq.h
+++ b/arch/arm/include/samdl/samd20_irq.h
@@ -127,7 +127,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/stm32/irq.h b/arch/arm/include/stm32/irq.h
index e568d18d82a..04f301c6964 100644
--- a/arch/arm/include/stm32/irq.h
+++ b/arch/arm/include/stm32/irq.h
@@ -104,7 +104,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/stm32/stm32f10xxx_irq.h b/arch/arm/include/stm32/stm32f10xxx_irq.h
index 34c038c6a0b..448e68c3089 100644
--- a/arch/arm/include/stm32/stm32f10xxx_irq.h
+++ b/arch/arm/include/stm32/stm32f10xxx_irq.h
@@ -293,7 +293,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/stm32/stm32f20xxx_irq.h b/arch/arm/include/stm32/stm32f20xxx_irq.h
index 1eb7d0ded22..99de060008f 100644
--- a/arch/arm/include/stm32/stm32f20xxx_irq.h
+++ b/arch/arm/include/stm32/stm32f20xxx_irq.h
@@ -164,7 +164,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/stm32/stm32f30xxx_irq.h b/arch/arm/include/stm32/stm32f30xxx_irq.h
index b53f248462e..266c4feee67 100644
--- a/arch/arm/include/stm32/stm32f30xxx_irq.h
+++ b/arch/arm/include/stm32/stm32f30xxx_irq.h
@@ -175,7 +175,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/stm32/stm32f37xxx_irq.h b/arch/arm/include/stm32/stm32f37xxx_irq.h
index c13c5983009..20ff8939cda 100644
--- a/arch/arm/include/stm32/stm32f37xxx_irq.h
+++ b/arch/arm/include/stm32/stm32f37xxx_irq.h
@@ -161,7 +161,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/stm32/stm32f40xxx_irq.h b/arch/arm/include/stm32/stm32f40xxx_irq.h
index a7da7c9f8a6..bc94c6b6695 100644
--- a/arch/arm/include/stm32/stm32f40xxx_irq.h
+++ b/arch/arm/include/stm32/stm32f40xxx_irq.h
@@ -191,7 +191,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/stm32/stm32l15xxx_irq.h b/arch/arm/include/stm32/stm32l15xxx_irq.h
index 905a33e2d24..b8d689abd76 100644
--- a/arch/arm/include/stm32/stm32l15xxx_irq.h
+++ b/arch/arm/include/stm32/stm32l15xxx_irq.h
@@ -254,7 +254,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/str71x/irq.h b/arch/arm/include/str71x/irq.h
index 28249eb2541..08f64d4706d 100644
--- a/arch/arm/include/str71x/irq.h
+++ b/arch/arm/include/str71x/irq.h
@@ -132,7 +132,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/include/syscall.h b/arch/arm/include/syscall.h
index 5152e48e8b4..1f4cc215323 100644
--- a/arch/arm/include/syscall.h
+++ b/arch/arm/include/syscall.h
@@ -79,7 +79,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/arm/arm.h b/arch/arm/src/arm/arm.h
index 68036ef2e91..4f097f0b620 100644
--- a/arch/arm/src/arm/arm.h
+++ b/arch/arm/src/arm/arm.h
@@ -437,7 +437,8 @@ static inline void tlb_data_invalidate_single(unsigned int mva)
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/armv7-a/arm.h b/arch/arm/src/armv7-a/arm.h
index e6784f2b7cf..dbdb65e0ea6 100644
--- a/arch/arm/src/armv7-a/arm.h
+++ b/arch/arm/src/armv7-a/arm.h
@@ -106,7 +106,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/armv7-a/cp15_cacheops.h b/arch/arm/src/armv7-a/cp15_cacheops.h
index 9b99e0d230b..9aa1bbbc932 100644
--- a/arch/arm/src/armv7-a/cp15_cacheops.h
+++ b/arch/arm/src/armv7-a/cp15_cacheops.h
@@ -881,7 +881,8 @@ static inline void cp15_cleaninvalidate_dcacheline(unsigned int setway)
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/armv7-a/fpu.h b/arch/arm/src/armv7-a/fpu.h
index 9ec290c2cd2..354af29f10c 100644
--- a/arch/arm/src/armv7-a/fpu.h
+++ b/arch/arm/src/armv7-a/fpu.h
@@ -62,7 +62,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/armv7-a/mmu.h b/arch/arm/src/armv7-a/mmu.h
index 59bc056a219..6b7fbfb7797 100644
--- a/arch/arm/src/armv7-a/mmu.h
+++ b/arch/arm/src/armv7-a/mmu.h
@@ -1365,7 +1365,8 @@ static inline uint32_t mmu_l2_getentry(uint32_t l2vaddr, uint32_t vaddr)
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/armv7-a/sctlr.h b/arch/arm/src/armv7-a/sctlr.h
index 30b14bb3156..21441ef050f 100644
--- a/arch/arm/src/armv7-a/sctlr.h
+++ b/arch/arm/src/armv7-a/sctlr.h
@@ -354,7 +354,8 @@ static inline void cp15_wrvbar(unsigned int sctlr)
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/kl/kl_clockconfig.h b/arch/arm/src/kl/kl_clockconfig.h
index 1de60d07a4e..45b70c9cbd3 100644
--- a/arch/arm/src/kl/kl_clockconfig.h
+++ b/arch/arm/src/kl/kl_clockconfig.h
@@ -57,7 +57,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/kl/kl_dma.h b/arch/arm/src/kl/kl_dma.h
index 1e4860bd393..3288ff7feae 100644
--- a/arch/arm/src/kl/kl_dma.h
+++ b/arch/arm/src/kl/kl_dma.h
@@ -57,7 +57,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/kl/kl_irq.h b/arch/arm/src/kl/kl_irq.h
index ee5de9309d3..150e032c72d 100644
--- a/arch/arm/src/kl/kl_irq.h
+++ b/arch/arm/src/kl/kl_irq.h
@@ -59,7 +59,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/kl/kl_pwm.h b/arch/arm/src/kl/kl_pwm.h
index f1544157685..f9afbcd7800 100644
--- a/arch/arm/src/kl/kl_pwm.h
+++ b/arch/arm/src/kl/kl_pwm.h
@@ -155,7 +155,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/kl/kl_spi.h b/arch/arm/src/kl/kl_spi.h
index acc32083da3..223b6d6e52c 100644
--- a/arch/arm/src/kl/kl_spi.h
+++ b/arch/arm/src/kl/kl_spi.h
@@ -57,7 +57,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/lpc17xx/lpc17_sdcard.h b/arch/arm/src/lpc17xx/lpc17_sdcard.h
index 12c2fba9dcf..520175ec25c 100644
--- a/arch/arm/src/lpc17xx/lpc17_sdcard.h
+++ b/arch/arm/src/lpc17xx/lpc17_sdcard.h
@@ -56,7 +56,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_ethernet.h b/arch/arm/src/lpc43xx/chip/lpc43_ethernet.h
index 275f896ad01..5be34dc3ea4 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_ethernet.h
+++ b/arch/arm/src/lpc43xx/chip/lpc43_ethernet.h
@@ -655,7 +655,8 @@ struct eth_rxdesc_s
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/lpc43xx/lpc43_adc.h b/arch/arm/src/lpc43xx/lpc43_adc.h
index ae8cef6c183..ebb9443e4d1 100644
--- a/arch/arm/src/lpc43xx/lpc43_adc.h
+++ b/arch/arm/src/lpc43xx/lpc43_adc.h
@@ -63,7 +63,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.h b/arch/arm/src/lpc43xx/lpc43_spifi.h
index 2193a3b2f82..44459192591 100644
--- a/arch/arm/src/lpc43xx/lpc43_spifi.h
+++ b/arch/arm/src/lpc43xx/lpc43_spifi.h
@@ -98,7 +98,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/nuc1xx/nuc_gpio.h b/arch/arm/src/nuc1xx/nuc_gpio.h
index 58eaea57092..52e9dd20950 100644
--- a/arch/arm/src/nuc1xx/nuc_gpio.h
+++ b/arch/arm/src/nuc1xx/nuc_gpio.h
@@ -189,7 +189,8 @@ typedef uint16_t gpio_cfgset_t;
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/sam34/sam_udp.h b/arch/arm/src/sam34/sam_udp.h
index 497cf2992f4..38b665f865f 100644
--- a/arch/arm/src/sam34/sam_udp.h
+++ b/arch/arm/src/sam34/sam_udp.h
@@ -56,7 +56,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/sama5/sam_can.h b/arch/arm/src/sama5/sam_can.h
index 6cf0ae4bcd3..c18361533f2 100644
--- a/arch/arm/src/sama5/sam_can.h
+++ b/arch/arm/src/sama5/sam_can.h
@@ -109,7 +109,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/sama5/sam_isi.h b/arch/arm/src/sama5/sam_isi.h
index 24bbb01b9d6..5b3bc7482fc 100644
--- a/arch/arm/src/sama5/sam_isi.h
+++ b/arch/arm/src/sama5/sam_isi.h
@@ -57,7 +57,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/sama5/sam_nand.h b/arch/arm/src/sama5/sam_nand.h
index ca1d8fd8181..f4229b8d6c0 100644
--- a/arch/arm/src/sama5/sam_nand.h
+++ b/arch/arm/src/sama5/sam_nand.h
@@ -375,7 +375,8 @@ struct sam_nand_s
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/sama5/sam_pck.h b/arch/arm/src/sama5/sam_pck.h
index 4e3f2ad8649..0d8199e8ea8 100644
--- a/arch/arm/src/sama5/sam_pck.h
+++ b/arch/arm/src/sama5/sam_pck.h
@@ -77,7 +77,8 @@ enum pckid_clksrc_e
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/sama5/sam_sckc.h b/arch/arm/src/sama5/sam_sckc.h
index c4296c167c6..0dc2a2ed4ce 100644
--- a/arch/arm/src/sama5/sam_sckc.h
+++ b/arch/arm/src/sama5/sam_sckc.h
@@ -56,7 +56,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/sama5/sam_trng.h b/arch/arm/src/sama5/sam_trng.h
index dd379edc39b..d27186ac3cc 100644
--- a/arch/arm/src/sama5/sam_trng.h
+++ b/arch/arm/src/sama5/sam_trng.h
@@ -56,7 +56,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/sama5/sam_udphs.h b/arch/arm/src/sama5/sam_udphs.h
index 72592f86036..1f8ec79dec9 100644
--- a/arch/arm/src/sama5/sam_udphs.h
+++ b/arch/arm/src/sama5/sam_udphs.h
@@ -56,7 +56,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/sama5/sam_wdt.h b/arch/arm/src/sama5/sam_wdt.h
index 41f139ee7c1..6f99082e163 100644
--- a/arch/arm/src/sama5/sam_wdt.h
+++ b/arch/arm/src/sama5/sam_wdt.h
@@ -56,7 +56,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/stm32/stm32_tim.h b/arch/arm/src/stm32/stm32_tim.h
index b9b1b128d07..fadf58e6b74 100644
--- a/arch/arm/src/stm32/stm32_tim.h
+++ b/arch/arm/src/stm32/stm32_tim.h
@@ -75,7 +75,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/arm/src/stm32/stm32_usbhost.h b/arch/arm/src/stm32/stm32_usbhost.h
index 362944c67d5..2a6a7335446 100644
--- a/arch/arm/src/stm32/stm32_usbhost.h
+++ b/arch/arm/src/stm32/stm32_usbhost.h
@@ -248,7 +248,8 @@ enum usbhost_trace1codes_e
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/avr/include/arch.h b/arch/avr/include/arch.h
index 662d9a98463..4e753a0f114 100644
--- a/arch/avr/include/arch.h
+++ b/arch/avr/include/arch.h
@@ -68,7 +68,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/avr/include/at32uc3/irq.h b/arch/avr/include/at32uc3/irq.h
index 64861001efb..5873579f25c 100644
--- a/arch/avr/include/at32uc3/irq.h
+++ b/arch/avr/include/at32uc3/irq.h
@@ -620,7 +620,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/avr/include/at90usb/irq.h b/arch/avr/include/at90usb/irq.h
index be15e51454e..7980526d7b7 100644
--- a/arch/avr/include/at90usb/irq.h
+++ b/arch/avr/include/at90usb/irq.h
@@ -117,7 +117,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/avr/include/avr/irq.h b/arch/avr/include/avr/irq.h
index 1a366952592..afca2e588dd 100644
--- a/arch/avr/include/avr/irq.h
+++ b/arch/avr/include/avr/irq.h
@@ -192,7 +192,8 @@ static inline void irqrestore(irqstate_t flags)
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/avr/include/avr32/irq.h b/arch/avr/include/avr32/irq.h
index 28b2e9c163f..2ef80d26520 100644
--- a/arch/avr/include/avr32/irq.h
+++ b/arch/avr/include/avr32/irq.h
@@ -202,7 +202,8 @@ static inline void irqrestore(irqstate_t flags)
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/avr/include/irq.h b/arch/avr/include/irq.h
index 55b021c6754..1d90e5637ef 100644
--- a/arch/avr/include/irq.h
+++ b/arch/avr/include/irq.h
@@ -85,7 +85,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/avr/include/syscall.h b/arch/avr/include/syscall.h
index 69390098de9..2f5db66a6c7 100644
--- a/arch/avr/include/syscall.h
+++ b/arch/avr/include/syscall.h
@@ -75,7 +75,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/avr/include/xmega/xmegac_irq.h b/arch/avr/include/xmega/xmegac_irq.h
index 048c626751e..acc5bd86e86 100644
--- a/arch/avr/include/xmega/xmegac_irq.h
+++ b/arch/avr/include/xmega/xmegac_irq.h
@@ -109,7 +109,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/hc/include/arch.h b/arch/hc/include/arch.h
index 6f2c3387557..d4b470fdd3a 100644
--- a/arch/hc/include/arch.h
+++ b/arch/hc/include/arch.h
@@ -68,7 +68,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/hc/include/hc12/irq.h b/arch/hc/include/hc12/irq.h
index ffb933b27d8..82135f3d685 100644
--- a/arch/hc/include/hc12/irq.h
+++ b/arch/hc/include/hc12/irq.h
@@ -93,7 +93,8 @@ static inline void system_call3(unsigned int nbr, uintptr_t parm1,
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/hc/include/hcs12/irq.h b/arch/hc/include/hcs12/irq.h
index 064edee08de..4b2df8acf65 100644
--- a/arch/hc/include/hcs12/irq.h
+++ b/arch/hc/include/hcs12/irq.h
@@ -256,7 +256,8 @@ static inline void system_call3(unsigned int nbr, uintptr_t parm1,
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/hc/include/irq.h b/arch/hc/include/irq.h
index cb918c6afd2..160f41a9fcb 100644
--- a/arch/hc/include/irq.h
+++ b/arch/hc/include/irq.h
@@ -85,7 +85,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/hc/include/m9s12/irq.h b/arch/hc/include/m9s12/irq.h
index 56deb2ede15..63ab556b8e4 100644
--- a/arch/hc/include/m9s12/irq.h
+++ b/arch/hc/include/m9s12/irq.h
@@ -172,7 +172,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/hc/include/syscall.h b/arch/hc/include/syscall.h
index 20e3df5851b..efb94f4ef91 100644
--- a/arch/hc/include/syscall.h
+++ b/arch/hc/include/syscall.h
@@ -67,7 +67,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/include/arch.h b/arch/mips/include/arch.h
index 894b4453ff6..9fffb8a89e0 100644
--- a/arch/mips/include/arch.h
+++ b/arch/mips/include/arch.h
@@ -68,7 +68,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/include/mips32/cp0.h b/arch/mips/include/mips32/cp0.h
index d3e80dfa09b..e6668fa8e3d 100644
--- a/arch/mips/include/mips32/cp0.h
+++ b/arch/mips/include/mips32/cp0.h
@@ -561,7 +561,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/include/mips32/registers.h b/arch/mips/include/mips32/registers.h
index 2beff5190c4..00696dce44c 100644
--- a/arch/mips/include/mips32/registers.h
+++ b/arch/mips/include/mips32/registers.h
@@ -131,7 +131,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/include/pic32mx/chip.h b/arch/mips/include/pic32mx/chip.h
index 4ebf69ccfb1..1b3266d435d 100644
--- a/arch/mips/include/pic32mx/chip.h
+++ b/arch/mips/include/pic32mx/chip.h
@@ -2416,7 +2416,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/include/pic32mx/cp0.h b/arch/mips/include/pic32mx/cp0.h
index 11a0404e41f..81e542cd07a 100644
--- a/arch/mips/include/pic32mx/cp0.h
+++ b/arch/mips/include/pic32mx/cp0.h
@@ -381,7 +381,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/include/pic32mx/irq.h b/arch/mips/include/pic32mx/irq.h
index 7c9da70992e..96896cf8f26 100644
--- a/arch/mips/include/pic32mx/irq.h
+++ b/arch/mips/include/pic32mx/irq.h
@@ -199,7 +199,8 @@ static inline void cp0_putebase(uint32_t ebase)
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/include/pic32mx/irq_1xx2xx.h b/arch/mips/include/pic32mx/irq_1xx2xx.h
index 9ca71690bc9..6fe7c257709 100644
--- a/arch/mips/include/pic32mx/irq_1xx2xx.h
+++ b/arch/mips/include/pic32mx/irq_1xx2xx.h
@@ -200,7 +200,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/include/pic32mx/irq_3xx4xx.h b/arch/mips/include/pic32mx/irq_3xx4xx.h
index 36b1b24186e..0d263c71ae5 100644
--- a/arch/mips/include/pic32mx/irq_3xx4xx.h
+++ b/arch/mips/include/pic32mx/irq_3xx4xx.h
@@ -189,7 +189,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/include/pic32mx/irq_5xx6xx7xx.h b/arch/mips/include/pic32mx/irq_5xx6xx7xx.h
index e940793143d..e1f18b6d4df 100644
--- a/arch/mips/include/pic32mx/irq_5xx6xx7xx.h
+++ b/arch/mips/include/pic32mx/irq_5xx6xx7xx.h
@@ -258,7 +258,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/include/syscall.h b/arch/mips/include/syscall.h
index 15dd5d855e7..67ac42bea59 100644
--- a/arch/mips/include/syscall.h
+++ b/arch/mips/include/syscall.h
@@ -73,7 +73,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/mips32/mips32-memorymap.h b/arch/mips/src/mips32/mips32-memorymap.h
index b6c5447a762..103ca6e2be6 100644
--- a/arch/mips/src/mips32/mips32-memorymap.h
+++ b/arch/mips/src/mips32/mips32-memorymap.h
@@ -82,7 +82,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/chip.h b/arch/mips/src/pic32mx/chip.h
index 05f22777bac..90c037c4388 100644
--- a/arch/mips/src/pic32mx/chip.h
+++ b/arch/mips/src/pic32mx/chip.h
@@ -62,7 +62,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-adc.h b/arch/mips/src/pic32mx/pic32mx-adc.h
index aec5a1215f2..1a29d3af62f 100644
--- a/arch/mips/src/pic32mx/pic32mx-adc.h
+++ b/arch/mips/src/pic32mx/pic32mx-adc.h
@@ -229,7 +229,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-bmx.h b/arch/mips/src/pic32mx/pic32mx-bmx.h
index ea006b5c223..fc46cd81581 100644
--- a/arch/mips/src/pic32mx/pic32mx-bmx.h
+++ b/arch/mips/src/pic32mx/pic32mx-bmx.h
@@ -152,7 +152,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-can.h b/arch/mips/src/pic32mx/pic32mx-can.h
index cc0c9573c08..edc8d1e6b9d 100644
--- a/arch/mips/src/pic32mx/pic32mx-can.h
+++ b/arch/mips/src/pic32mx/pic32mx-can.h
@@ -75,7 +75,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-che.h b/arch/mips/src/pic32mx/pic32mx-che.h
index 72a7d5f7640..3ea57056bc5 100644
--- a/arch/mips/src/pic32mx/pic32mx-che.h
+++ b/arch/mips/src/pic32mx/pic32mx-che.h
@@ -171,7 +171,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-cm.h b/arch/mips/src/pic32mx/pic32mx-cm.h
index ed443cee6ee..7346761e525 100644
--- a/arch/mips/src/pic32mx/pic32mx-cm.h
+++ b/arch/mips/src/pic32mx/pic32mx-cm.h
@@ -125,7 +125,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-cvr.h b/arch/mips/src/pic32mx/pic32mx-cvr.h
index 3070d179a08..51ef90d49f8 100644
--- a/arch/mips/src/pic32mx/pic32mx-cvr.h
+++ b/arch/mips/src/pic32mx/pic32mx-cvr.h
@@ -99,7 +99,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-ddp.h b/arch/mips/src/pic32mx/pic32mx-ddp.h
index 41eb234dd53..d7ba7c73186 100644
--- a/arch/mips/src/pic32mx/pic32mx-ddp.h
+++ b/arch/mips/src/pic32mx/pic32mx-ddp.h
@@ -80,7 +80,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-devcfg.h b/arch/mips/src/pic32mx/pic32mx-devcfg.h
index e70effbc00f..506a77ad5e4 100644
--- a/arch/mips/src/pic32mx/pic32mx-devcfg.h
+++ b/arch/mips/src/pic32mx/pic32mx-devcfg.h
@@ -268,7 +268,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-dma.h b/arch/mips/src/pic32mx/pic32mx-dma.h
index 866f99dd835..e41c80f8106 100644
--- a/arch/mips/src/pic32mx/pic32mx-dma.h
+++ b/arch/mips/src/pic32mx/pic32mx-dma.h
@@ -681,7 +681,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-ethernet.h b/arch/mips/src/pic32mx/pic32mx-ethernet.h
index 69a83fe6a3d..fa85b782ce4 100644
--- a/arch/mips/src/pic32mx/pic32mx-ethernet.h
+++ b/arch/mips/src/pic32mx/pic32mx-ethernet.h
@@ -916,7 +916,8 @@ struct pic32mx_rxdesc_s
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-flash.h b/arch/mips/src/pic32mx/pic32mx-flash.h
index 64dfd83b6c0..852ad5439d8 100644
--- a/arch/mips/src/pic32mx/pic32mx-flash.h
+++ b/arch/mips/src/pic32mx/pic32mx-flash.h
@@ -116,7 +116,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-i2c.h b/arch/mips/src/pic32mx/pic32mx-i2c.h
index 9179692ed13..6475caba494 100644
--- a/arch/mips/src/pic32mx/pic32mx-i2c.h
+++ b/arch/mips/src/pic32mx/pic32mx-i2c.h
@@ -291,7 +291,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-ic.h b/arch/mips/src/pic32mx/pic32mx-ic.h
index 6fc67fcf8b7..d1b3070f52f 100644
--- a/arch/mips/src/pic32mx/pic32mx-ic.h
+++ b/arch/mips/src/pic32mx/pic32mx-ic.h
@@ -151,7 +151,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-int.h b/arch/mips/src/pic32mx/pic32mx-int.h
index d9d594ce2e1..3443640c91f 100644
--- a/arch/mips/src/pic32mx/pic32mx-int.h
+++ b/arch/mips/src/pic32mx/pic32mx-int.h
@@ -1070,7 +1070,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-ioport.h b/arch/mips/src/pic32mx/pic32mx-ioport.h
index 485a0620d0e..07dc1b88c00 100644
--- a/arch/mips/src/pic32mx/pic32mx-ioport.h
+++ b/arch/mips/src/pic32mx/pic32mx-ioport.h
@@ -466,7 +466,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-memorymap.h b/arch/mips/src/pic32mx/pic32mx-memorymap.h
index e0d6756f26f..5b5ce8020b6 100644
--- a/arch/mips/src/pic32mx/pic32mx-memorymap.h
+++ b/arch/mips/src/pic32mx/pic32mx-memorymap.h
@@ -520,7 +520,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-oc.h b/arch/mips/src/pic32mx/pic32mx-oc.h
index fff8b64288f..3e77f9630f2 100644
--- a/arch/mips/src/pic32mx/pic32mx-oc.h
+++ b/arch/mips/src/pic32mx/pic32mx-oc.h
@@ -196,7 +196,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-osc.h b/arch/mips/src/pic32mx/pic32mx-osc.h
index 7975d42201c..b81d7574427 100644
--- a/arch/mips/src/pic32mx/pic32mx-osc.h
+++ b/arch/mips/src/pic32mx/pic32mx-osc.h
@@ -151,7 +151,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-pmp.h b/arch/mips/src/pic32mx/pic32mx-pmp.h
index 015e814590c..637480e5491 100644
--- a/arch/mips/src/pic32mx/pic32mx-pmp.h
+++ b/arch/mips/src/pic32mx/pic32mx-pmp.h
@@ -225,7 +225,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-pps.h b/arch/mips/src/pic32mx/pic32mx-pps.h
index 7b654bd4700..950792702fa 100644
--- a/arch/mips/src/pic32mx/pic32mx-pps.h
+++ b/arch/mips/src/pic32mx/pic32mx-pps.h
@@ -260,7 +260,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-reset.h b/arch/mips/src/pic32mx/pic32mx-reset.h
index eb26e50c967..5cddd8bfc39 100644
--- a/arch/mips/src/pic32mx/pic32mx-reset.h
+++ b/arch/mips/src/pic32mx/pic32mx-reset.h
@@ -103,7 +103,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-rtcc.h b/arch/mips/src/pic32mx/pic32mx-rtcc.h
index 7f57bf6333e..93618ce7d26 100644
--- a/arch/mips/src/pic32mx/pic32mx-rtcc.h
+++ b/arch/mips/src/pic32mx/pic32mx-rtcc.h
@@ -205,7 +205,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-spi.h b/arch/mips/src/pic32mx/pic32mx-spi.h
index 9f4b83a66f0..cccafd5eddd 100644
--- a/arch/mips/src/pic32mx/pic32mx-spi.h
+++ b/arch/mips/src/pic32mx/pic32mx-spi.h
@@ -276,7 +276,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-timer.h b/arch/mips/src/pic32mx/pic32mx-timer.h
index e34f7011040..47c78f11389 100644
--- a/arch/mips/src/pic32mx/pic32mx-timer.h
+++ b/arch/mips/src/pic32mx/pic32mx-timer.h
@@ -207,7 +207,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-uart.h b/arch/mips/src/pic32mx/pic32mx-uart.h
index d1b80b4a460..c348c6c10ae 100644
--- a/arch/mips/src/pic32mx/pic32mx-uart.h
+++ b/arch/mips/src/pic32mx/pic32mx-uart.h
@@ -263,7 +263,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-usbotg.h b/arch/mips/src/pic32mx/pic32mx-usbotg.h
index e27d48545ce..11b3231886c 100644
--- a/arch/mips/src/pic32mx/pic32mx-usbotg.h
+++ b/arch/mips/src/pic32mx/pic32mx-usbotg.h
@@ -347,7 +347,8 @@ struct usbotg_bdtentry_s
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-wdt.h b/arch/mips/src/pic32mx/pic32mx-wdt.h
index 319ec59d5e7..abbb49c9810 100644
--- a/arch/mips/src/pic32mx/pic32mx-wdt.h
+++ b/arch/mips/src/pic32mx/pic32mx-wdt.h
@@ -103,7 +103,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/mips/src/pic32mz/chip/pic32mz-spi.h b/arch/mips/src/pic32mz/chip/pic32mz-spi.h
index 0c66649393c..d4f5fe42a50 100644
--- a/arch/mips/src/pic32mz/chip/pic32mz-spi.h
+++ b/arch/mips/src/pic32mz/chip/pic32mz-spi.h
@@ -315,7 +315,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/rgmp/include/math.h b/arch/rgmp/include/math.h
index 24a68ee1325..790acab6285 100644
--- a/arch/rgmp/include/math.h
+++ b/arch/rgmp/include/math.h
@@ -50,7 +50,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/rgmp/include/x86/arch/subarch/arch.h b/arch/rgmp/include/x86/arch/subarch/arch.h
index 0637dbd39f5..b88cb34155c 100644
--- a/arch/rgmp/include/x86/arch/subarch/arch.h
+++ b/arch/rgmp/include/x86/arch/subarch/arch.h
@@ -43,7 +43,8 @@
 #ifndef __ASSEMBLY__
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <rgmp/arch/hpet.h>
diff --git a/arch/sh/include/arch.h b/arch/sh/include/arch.h
index 9141b5c24fc..2ee75e5939a 100644
--- a/arch/sh/include/arch.h
+++ b/arch/sh/include/arch.h
@@ -66,7 +66,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/sh/include/irq.h b/arch/sh/include/irq.h
index f05d3007e01..1f0c25d35e7 100644
--- a/arch/sh/include/irq.h
+++ b/arch/sh/include/irq.h
@@ -70,7 +70,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/sh/include/m16c/irq.h b/arch/sh/include/m16c/irq.h
index 0789f722fc6..88d4d1099cd 100644
--- a/arch/sh/include/m16c/irq.h
+++ b/arch/sh/include/m16c/irq.h
@@ -268,7 +268,8 @@ struct xcptcontext
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/sh/include/sh1/irq.h b/arch/sh/include/sh1/irq.h
index 19a26dc1a76..b2d839019ae 100644
--- a/arch/sh/include/sh1/irq.h
+++ b/arch/sh/include/sh1/irq.h
@@ -485,7 +485,8 @@ struct xcptcontext
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/sh/include/syscall.h b/arch/sh/include/syscall.h
index d9fdb7ccbfb..38fb6e2aa95 100644
--- a/arch/sh/include/syscall.h
+++ b/arch/sh/include/syscall.h
@@ -67,7 +67,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/sim/include/arch.h b/arch/sim/include/arch.h
index f039d3fa3c9..b2ae4b26498 100644
--- a/arch/sim/include/arch.h
+++ b/arch/sim/include/arch.h
@@ -66,7 +66,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/sim/include/syscall.h b/arch/sim/include/syscall.h
index 0486ffe2721..19c57fca2e8 100644
--- a/arch/sim/include/syscall.h
+++ b/arch/sim/include/syscall.h
@@ -67,7 +67,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/x86/include/arch.h b/arch/x86/include/arch.h
index a347c1e7ff5..76f5fe979a1 100644
--- a/arch/x86/include/arch.h
+++ b/arch/x86/include/arch.h
@@ -78,7 +78,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/x86/include/i486/io.h b/arch/x86/include/i486/io.h
index 3b3a7a854b2..47431b0eddb 100644
--- a/arch/x86/include/i486/io.h
+++ b/arch/x86/include/i486/io.h
@@ -134,7 +134,8 @@ static inline uint32_t inl(uint16_t port)
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/x86/include/i486/irq.h b/arch/x86/include/i486/irq.h
index 8f83d601f89..cc1a9f5eb8f 100644
--- a/arch/x86/include/i486/irq.h
+++ b/arch/x86/include/i486/irq.h
@@ -272,7 +272,8 @@ static inline void system_call3(unsigned int nbr, uintptr_t parm1,
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/x86/include/io.h b/arch/x86/include/io.h
index 8c38a5f6f4c..b8cdde51f43 100644
--- a/arch/x86/include/io.h
+++ b/arch/x86/include/io.h
@@ -71,7 +71,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/x86/include/irq.h b/arch/x86/include/irq.h
index 2bccacb2d63..12f12c156e0 100644
--- a/arch/x86/include/irq.h
+++ b/arch/x86/include/irq.h
@@ -83,7 +83,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/x86/include/qemu/arch.h b/arch/x86/include/qemu/arch.h
index 395d65fce5c..5ebc6dd93d7 100644
--- a/arch/x86/include/qemu/arch.h
+++ b/arch/x86/include/qemu/arch.h
@@ -66,7 +66,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/x86/include/qemu/irq.h b/arch/x86/include/qemu/irq.h
index 8a5242a2c3d..93520771236 100644
--- a/arch/x86/include/qemu/irq.h
+++ b/arch/x86/include/qemu/irq.h
@@ -66,7 +66,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/x86/include/syscall.h b/arch/x86/include/syscall.h
index 3fc9a14a7f8..2ecc22734b8 100644
--- a/arch/x86/include/syscall.h
+++ b/arch/x86/include/syscall.h
@@ -73,7 +73,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/z16/include/arch.h b/arch/z16/include/arch.h
index 1d94cbfa908..048bc011420 100644
--- a/arch/z16/include/arch.h
+++ b/arch/z16/include/arch.h
@@ -66,7 +66,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/z16/include/irq.h b/arch/z16/include/irq.h
index 119613c687f..ce195b1decf 100644
--- a/arch/z16/include/irq.h
+++ b/arch/z16/include/irq.h
@@ -66,7 +66,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/z16/include/syscall.h b/arch/z16/include/syscall.h
index a636a72bf28..ceb6222cf31 100644
--- a/arch/z16/include/syscall.h
+++ b/arch/z16/include/syscall.h
@@ -67,7 +67,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/z16/include/z16f/arch.h b/arch/z16/include/z16f/arch.h
index deb4b7a90c1..c05cb31c1be 100644
--- a/arch/z16/include/z16f/arch.h
+++ b/arch/z16/include/z16f/arch.h
@@ -62,7 +62,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/z16/include/z16f/chip.h b/arch/z16/include/z16f/chip.h
index 2f8acfcf85c..2ff4b4174b5 100644
--- a/arch/z16/include/z16f/chip.h
+++ b/arch/z16/include/z16f/chip.h
@@ -58,7 +58,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/z80/include/ez80/arch.h b/arch/z80/include/ez80/arch.h
index a055665ed5a..2914d5b30a5 100644
--- a/arch/z80/include/ez80/arch.h
+++ b/arch/z80/include/ez80/arch.h
@@ -63,7 +63,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/z80/include/z180/arch.h b/arch/z80/include/z180/arch.h
index 64e1112f52b..4fba27919b2 100644
--- a/arch/z80/include/z180/arch.h
+++ b/arch/z80/include/z180/arch.h
@@ -85,7 +85,8 @@ typedef FAR struct z180_cbr_s *group_addrenv_t;
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/z80/include/z8/arch.h b/arch/z80/include/z8/arch.h
index 6c07a385ab8..a3bab32a71b 100644
--- a/arch/z80/include/z8/arch.h
+++ b/arch/z80/include/z8/arch.h
@@ -63,7 +63,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/z80/include/z80/arch.h b/arch/z80/include/z80/arch.h
index 077a72a7b14..23da0a8fd19 100644
--- a/arch/z80/include/z80/arch.h
+++ b/arch/z80/include/z80/arch.h
@@ -63,7 +63,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/z80/include/z80/chip.h b/arch/z80/include/z80/chip.h
index c355eb78877..ae4ad2891c3 100644
--- a/arch/z80/include/z80/chip.h
+++ b/arch/z80/include/z80/chip.h
@@ -65,7 +65,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/z80/src/ez80/chip.h b/arch/z80/src/ez80/chip.h
index 92eac7d0c67..981ad769e47 100644
--- a/arch/z80/src/ez80/chip.h
+++ b/arch/z80/src/ez80/chip.h
@@ -77,7 +77,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/z80/src/ez80/ez80f91.h b/arch/z80/src/ez80/ez80f91.h
index a84e41439cc..a1371571b7e 100644
--- a/arch/z80/src/ez80/ez80f91.h
+++ b/arch/z80/src/ez80/ez80f91.h
@@ -487,7 +487,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/z80/src/ez80/ez80f91_emac.h b/arch/z80/src/ez80/ez80f91_emac.h
index 8e7a8690a66..8e32e1ed835 100644
--- a/arch/z80/src/ez80/ez80f91_emac.h
+++ b/arch/z80/src/ez80/ez80f91_emac.h
@@ -270,7 +270,8 @@ struct ez80emac_desc_s
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif /* __cplusplus */
diff --git a/arch/z80/src/ez80/ez80f91_i2c.h b/arch/z80/src/ez80/ez80f91_i2c.h
index 87eda94ce82..f41fcfab3eb 100644
--- a/arch/z80/src/ez80/ez80f91_i2c.h
+++ b/arch/z80/src/ez80/ez80f91_i2c.h
@@ -131,7 +131,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif /* __cplusplus */
diff --git a/arch/z80/src/ez80/up_mem.h b/arch/z80/src/ez80/up_mem.h
index ba13001fd01..9f65b5d0842 100644
--- a/arch/z80/src/ez80/up_mem.h
+++ b/arch/z80/src/ez80/up_mem.h
@@ -74,7 +74,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/z80/src/z8/chip.h b/arch/z80/src/z8/chip.h
index b96d6c144e4..b85b478f138 100644
--- a/arch/z80/src/z8/chip.h
+++ b/arch/z80/src/z8/chip.h
@@ -224,7 +224,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/arch/z80/src/z8/up_mem.h b/arch/z80/src/z8/up_mem.h
index 681805e66b4..fe6854b4764 100644
--- a/arch/z80/src/z8/up_mem.h
+++ b/arch/z80/src/z8/up_mem.h
@@ -74,7 +74,8 @@
 #ifndef __ASSEMBLY__
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/ctype.h b/include/ctype.h
index fdcaad8dbed..67dc99e6e1a 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -210,7 +210,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/netinet/arp.h b/include/netinet/arp.h
index 5a041f4f084..caaa3e64b49 100644
--- a/include/netinet/arp.h
+++ b/include/netinet/arp.h
@@ -91,7 +91,8 @@ struct arpreq
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/analog/dac.h b/include/nuttx/analog/dac.h
index 4b37f15c812..5648b51a9a8 100644
--- a/include/nuttx/analog/dac.h
+++ b/include/nuttx/analog/dac.h
@@ -157,7 +157,8 @@ struct dac_dev_s
  ************************************************************************************/
 
 #if defined(__cplusplus)
-extern "C" {
+extern "C"
+{
 #endif
 
 /************************************************************************************
diff --git a/include/nuttx/binfmt/builtin.h b/include/nuttx/binfmt/builtin.h
index 51f3ef55bf4..6f4a87be243 100644
--- a/include/nuttx/binfmt/builtin.h
+++ b/include/nuttx/binfmt/builtin.h
@@ -68,7 +68,8 @@ struct builtin_s
 
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/binfmt/ieee695.h b/include/nuttx/binfmt/ieee695.h
index a459d4f3f30..31a037289f7 100644
--- a/include/nuttx/binfmt/ieee695.h
+++ b/include/nuttx/binfmt/ieee695.h
@@ -434,7 +434,8 @@ struct ieee695_modend_s
 
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/binfmt/nxflat.h b/include/nuttx/binfmt/nxflat.h
index 83abbb000c8..8e661115b00 100644
--- a/include/nuttx/binfmt/nxflat.h
+++ b/include/nuttx/binfmt/nxflat.h
@@ -123,7 +123,8 @@ struct nxflat_loadinfo_s
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/compiler.h b/include/nuttx/compiler.h
index 2a55adf3713..9cf1192c57a 100644
--- a/include/nuttx/compiler.h
+++ b/include/nuttx/compiler.h
@@ -485,7 +485,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/fs/binfs.h b/include/nuttx/fs/binfs.h
index d967506d818..d425ca95841 100644
--- a/include/nuttx/fs/binfs.h
+++ b/include/nuttx/fs/binfs.h
@@ -58,7 +58,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/fs/dirent.h b/include/nuttx/fs/dirent.h
index 1501b770d4f..b532d80c021 100644
--- a/include/nuttx/fs/dirent.h
+++ b/include/nuttx/fs/dirent.h
@@ -244,7 +244,8 @@ struct fs_dirent_s
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/fs/nfs.h b/include/nuttx/fs/nfs.h
index 67245ef2b6e..f2980d24076 100644
--- a/include/nuttx/fs/nfs.h
+++ b/include/nuttx/fs/nfs.h
@@ -95,7 +95,8 @@ struct nfs_args
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/fs/procfs.h b/include/nuttx/fs/procfs.h
index 120087937fe..7dfb6da1236 100644
--- a/include/nuttx/fs/procfs.h
+++ b/include/nuttx/fs/procfs.h
@@ -129,7 +129,8 @@ struct procfs_dir_priv_s
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/input/ads7843e.h b/include/nuttx/input/ads7843e.h
index 671bd90490c..4c4b3b11891 100644
--- a/include/nuttx/input/ads7843e.h
+++ b/include/nuttx/input/ads7843e.h
@@ -150,7 +150,8 @@ struct ads7843e_config_s
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/input/keypad.h b/include/nuttx/input/keypad.h
index 574b421c1a1..b38111c9e54 100644
--- a/include/nuttx/input/keypad.h
+++ b/include/nuttx/input/keypad.h
@@ -41,7 +41,8 @@
  ****************************************************************************/
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 int keypad_kbdinit(void);
diff --git a/include/nuttx/net/encx24j600.h b/include/nuttx/net/encx24j600.h
index d323583836f..0a39373a822 100644
--- a/include/nuttx/net/encx24j600.h
+++ b/include/nuttx/net/encx24j600.h
@@ -116,7 +116,8 @@ struct enc_lower_s
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/net/gmii.h b/include/nuttx/net/gmii.h
index 6bf6e768bcd..85556700259 100644
--- a/include/nuttx/net/gmii.h
+++ b/include/nuttx/net/gmii.h
@@ -301,7 +301,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/net/mii.h b/include/nuttx/net/mii.h
index 951b5a6c560..6ac4dbc869c 100644
--- a/include/nuttx/net/mii.h
+++ b/include/nuttx/net/mii.h
@@ -592,7 +592,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/nx/nxbe.h b/include/nuttx/nx/nxbe.h
index 1a0f3bbb0fb..a4a871122ce 100644
--- a/include/nuttx/nx/nxbe.h
+++ b/include/nuttx/nx/nxbe.h
@@ -125,7 +125,8 @@ struct nxbe_window_s
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/progmem.h b/include/nuttx/progmem.h
index 7f5d13f89c5..77975550525 100644
--- a/include/nuttx/progmem.h
+++ b/include/nuttx/progmem.h
@@ -52,7 +52,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/pthread.h b/include/nuttx/pthread.h
index 23f39dc5a67..575baed2c68 100644
--- a/include/nuttx/pthread.h
+++ b/include/nuttx/pthread.h
@@ -65,7 +65,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/scsi.h b/include/nuttx/scsi.h
index 3cf589085d3..96259983574 100644
--- a/include/nuttx/scsi.h
+++ b/include/nuttx/scsi.h
@@ -1000,7 +1000,8 @@ struct scsicmd_verify12_s
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/sdio.h b/include/nuttx/sdio.h
index 94c41330817..0a818e75d73 100644
--- a/include/nuttx/sdio.h
+++ b/include/nuttx/sdio.h
@@ -906,7 +906,8 @@ struct sdio_dev_s
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/serial/tioctl.h b/include/nuttx/serial/tioctl.h
index 864629d3d9d..2044195e502 100644
--- a/include/nuttx/serial/tioctl.h
+++ b/include/nuttx/serial/tioctl.h
@@ -212,7 +212,8 @@ struct serial_rs485
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/usb/audio.h b/include/nuttx/usb/audio.h
index 44743874a5d..8bec3212251 100644
--- a/include/nuttx/usb/audio.h
+++ b/include/nuttx/usb/audio.h
@@ -1605,7 +1605,8 @@ struct adc_hires_timestamp_s
 #undef EXTERN
 #if defined(__cplusplus)
 # define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 # define EXTERN extern
 #endif
diff --git a/include/nuttx/usb/ehci.h b/include/nuttx/usb/ehci.h
index 690889aa7bc..85dcb0f12c9 100644
--- a/include/nuttx/usb/ehci.h
+++ b/include/nuttx/usb/ehci.h
@@ -911,7 +911,8 @@ struct ehci_fstn_s
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/usb/hid.h b/include/nuttx/usb/hid.h
index a8b5facbdbe..1e8d95a085b 100644
--- a/include/nuttx/usb/hid.h
+++ b/include/nuttx/usb/hid.h
@@ -684,7 +684,8 @@ struct usbhid_jsreport_s
 #undef EXTERN
 #if defined(__cplusplus)
 # define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 # define EXTERN extern
 #endif
diff --git a/include/nuttx/usb/ohci.h b/include/nuttx/usb/ohci.h
index 0d967c8d140..d6fea71c7e2 100644
--- a/include/nuttx/usb/ohci.h
+++ b/include/nuttx/usb/ohci.h
@@ -449,7 +449,8 @@ struct ohci_hcca_s
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/usb/usbhost_trace.h b/include/nuttx/usb/usbhost_trace.h
index 9f359883b2e..f8e8d1b4956 100644
--- a/include/nuttx/usb/usbhost_trace.h
+++ b/include/nuttx/usb/usbhost_trace.h
@@ -94,7 +94,8 @@ typedef int (*usbhost_trcallback_t)(FAR uint32_t trace, FAR void *arg);
 #undef EXTERN
 #if defined(__cplusplus)
 # define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 # define EXTERN extern
 #endif
diff --git a/include/nuttx/video/ov2640.h b/include/nuttx/video/ov2640.h
index eb9fa3ed69c..4c037fdea29 100644
--- a/include/nuttx/video/ov2640.h
+++ b/include/nuttx/video/ov2640.h
@@ -56,7 +56,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/video/rgbcolors.h b/include/nuttx/video/rgbcolors.h
index b19ec235d1c..be968ea2462 100644
--- a/include/nuttx/video/rgbcolors.h
+++ b/include/nuttx/video/rgbcolors.h
@@ -298,7 +298,8 @@ struct argbcolor_s
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/wireless/cc3000/evnt_handler.h b/include/nuttx/wireless/cc3000/evnt_handler.h
index a67fef891d5..6ffaa2c369f 100644
--- a/include/nuttx/wireless/cc3000/evnt_handler.h
+++ b/include/nuttx/wireless/cc3000/evnt_handler.h
@@ -109,7 +109,8 @@ typedef struct _bsd_gethostbyname_return_t
  ****************************************************************************/
 
 #ifdef  __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 extern unsigned long socket_active_status;
diff --git a/include/nuttx/wireless/cc3000/hci.h b/include/nuttx/wireless/cc3000/hci.h
index c4e1b1689d3..42c162b4e45 100644
--- a/include/nuttx/wireless/cc3000/hci.h
+++ b/include/nuttx/wireless/cc3000/hci.h
@@ -202,7 +202,8 @@
  *****************************************************************************/
 
 #ifdef  __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 /*****************************************************************************
diff --git a/include/nuttx/wireless/cc3000/include/cc3000_upif.h b/include/nuttx/wireless/cc3000/include/cc3000_upif.h
index e66c490ae9d..1240655ee15 100644
--- a/include/nuttx/wireless/cc3000/include/cc3000_upif.h
+++ b/include/nuttx/wireless/cc3000/include/cc3000_upif.h
@@ -155,7 +155,8 @@ struct cc3000_config_s
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/nuttx/wireless/cc3000/wlan.h b/include/nuttx/wireless/cc3000/wlan.h
index 78c65099878..e41724a46ed 100644
--- a/include/nuttx/wireless/cc3000/wlan.h
+++ b/include/nuttx/wireless/cc3000/wlan.h
@@ -57,7 +57,8 @@
  *****************************************************************************/
 
 #ifdef  __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 /*****************************************************************************
diff --git a/include/poll.h b/include/poll.h
index 106a6b23a6a..3c47ca19831 100644
--- a/include/poll.h
+++ b/include/poll.h
@@ -121,7 +121,8 @@ struct pollfd
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/queue.h b/include/queue.h
index 91c2c8c661d..7d10e86e1d2 100644
--- a/include/queue.h
+++ b/include/queue.h
@@ -96,7 +96,8 @@ typedef struct dq_queue_s dq_queue_t;
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/signal.h b/include/signal.h
index 8ef4d5f6a4f..492ce416c08 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -260,7 +260,8 @@ struct sigaction
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/sys/sendfile.h b/include/sys/sendfile.h
index a4e8821652d..5db6ff70c3e 100644
--- a/include/sys/sendfile.h
+++ b/include/sys/sendfile.h
@@ -64,7 +64,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/sys/sockio.h b/include/sys/sockio.h
index e9422ceeb9a..b2081f22e27 100644
--- a/include/sys/sockio.h
+++ b/include/sys/sockio.h
@@ -109,7 +109,8 @@ struct ip_msfilter
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/sys/syscall.h b/include/sys/syscall.h
index d21eba24e55..10c7a17ecd7 100644
--- a/include/sys/syscall.h
+++ b/include/sys/syscall.h
@@ -453,7 +453,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif