diff --git a/graphics/tiff/tiff_internal.h b/graphics/tiff/tiff_internal.h
index c7226e04d..ac7f91381 100644
--- a/graphics/tiff/tiff_internal.h
+++ b/graphics/tiff/tiff_internal.h
@@ -87,7 +87,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/netutils/thttpd.h b/include/netutils/thttpd.h
index 6079edab5..d24879709 100644
--- a/include/netutils/thttpd.h
+++ b/include/netutils/thttpd.h
@@ -51,7 +51,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/include/platform/configdata.h b/include/platform/configdata.h
index 90b4aa7bd..788b41674 100644
--- a/include/platform/configdata.h
+++ b/include/platform/configdata.h
@@ -81,7 +81,8 @@ enum config_data_e
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 
 #define EXTERN extern
diff --git a/include/readline.h b/include/readline.h
index e103db69f..df0f38ed4 100644
--- a/include/readline.h
+++ b/include/readline.h
@@ -53,7 +53,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/netutils/ftpc/ftpc_internal.h b/netutils/ftpc/ftpc_internal.h
index f4ef98b72..a79b981ab 100644
--- a/netutils/ftpc/ftpc_internal.h
+++ b/netutils/ftpc/ftpc_internal.h
@@ -198,7 +198,8 @@ struct ftpc_session_s
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/netutils/ftpd/ftpd.h b/netutils/ftpd/ftpd.h
index 003f8d2bf..4ec40e7b7 100644
--- a/netutils/ftpd/ftpd.h
+++ b/netutils/ftpd/ftpd.h
@@ -184,7 +184,8 @@ struct ftpd_protocol_s
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif