diff --git a/source/include/FreeRTOS_BitConfig.h b/source/include/FreeRTOS_BitConfig.h
index 5c27fc318..952bfb714 100644
--- a/source/include/FreeRTOS_BitConfig.h
+++ b/source/include/FreeRTOS_BitConfig.h
@@ -76,7 +76,7 @@
 
 
     #ifdef __cplusplus
-}         /* extern "C" */
+}     /* extern "C" */
     #endif
 
-#endif /* !defined( FREERTOS_STREAM_BUFFER_H ) */
+#endif /* FREERTOS_STREAM_BUFFER_H */
diff --git a/source/include/FreeRTOS_DHCPv6.h b/source/include/FreeRTOS_DHCPv6.h
index 70bbd7ddf..b591e8d3f 100644
--- a/source/include/FreeRTOS_DHCPv6.h
+++ b/source/include/FreeRTOS_DHCPv6.h
@@ -101,7 +101,7 @@
 
 /** @brief Default v6 DHCP client port. */
     #define ipDHCPv6_CLIENT_PORT                       546U
-    /** @brief Default v6 DHCP server port. */
+/** @brief Default v6 DHCP server port. */
     #define ipDHCPv6_SERVER_PORT                       547U
 
 /** @brief The ID of a client or a server. */
@@ -159,7 +159,7 @@
     void vDHCPv6Stop( struct xNetworkEndPoint * pxEndPoint );
 
     #ifdef __cplusplus
-}         /* extern "C" */
+}     /* extern "C" */
     #endif
 
 /* The application should supply the following time-function.
@@ -167,4 +167,4 @@
  * 1/1/1970. */
     extern uint32_t ulApplicationTimeHook( void );
 
-#endif /* FREERTOS_DHCPv6_H */
+#endif /* FREERTOS_DHCPV6_H */
diff --git a/source/include/FreeRTOS_DNS_Cache.h b/source/include/FreeRTOS_DNS_Cache.h
index 13aa42ec8..2dd6b19a3 100644
--- a/source/include/FreeRTOS_DNS_Cache.h
+++ b/source/include/FreeRTOS_DNS_Cache.h
@@ -81,4 +81,4 @@
                                   struct freertos_addrinfo ** ppxAddressInfo );
 #endif /* if ( ipconfigUSE_DNS_CACHE == 1 ) */
 
-#endif /* ifndef FREERTOS_DNS_CACHE_H */
+#endif /* FREERTOS_DNS_CACHE_H */
diff --git a/source/include/FreeRTOS_DNS_Callback.h b/source/include/FreeRTOS_DNS_Callback.h
index 0c940b0ef..81b40960c 100644
--- a/source/include/FreeRTOS_DNS_Callback.h
+++ b/source/include/FreeRTOS_DNS_Callback.h
@@ -72,4 +72,4 @@
 #endif
 /* *INDENT-ON* */
 
-#endif /* ifndef FREERTOS_DNS_CALLBACK_H */
+#endif /* FREERTOS_DNS_CALLBACK_H */
diff --git a/source/include/FreeRTOS_DNS_Globals.h b/source/include/FreeRTOS_DNS_Globals.h
index 649e8033c..fe4f75945 100644
--- a/source/include/FreeRTOS_DNS_Globals.h
+++ b/source/include/FreeRTOS_DNS_Globals.h
@@ -324,4 +324,4 @@
     #define ipMDNS_IP_ADDRESS    0xfb0000e0U /* 224.0.0.251 */
 #endif
 
-#endif /* ifndef FREERTOS_DNS_GLOBALS_H */
+#endif /* FREERTOS_DNS_GLOBALS_H */
diff --git a/source/include/FreeRTOS_DNS_Networking.h b/source/include/FreeRTOS_DNS_Networking.h
index 3ffbcfdc6..7a2ede391 100644
--- a/source/include/FreeRTOS_DNS_Networking.h
+++ b/source/include/FreeRTOS_DNS_Networking.h
@@ -59,4 +59,4 @@
     void DNS_CloseSocket( Socket_t xDNSSocket );
 
 #endif /* if ( ipconfigUSE_DNS != 0 ) */
-#endif /* ifndef FREERTOS_DNS_NETWORKING_H */
+#endif /* FREERTOS_DNS_NETWORKING_H */
diff --git a/source/include/FreeRTOS_DNS_Parser.h b/source/include/FreeRTOS_DNS_Parser.h
index cbc0f0175..e45e61924 100644
--- a/source/include/FreeRTOS_DNS_Parser.h
+++ b/source/include/FreeRTOS_DNS_Parser.h
@@ -38,6 +38,13 @@
 
 /* Standard includes. */
 #include <stdint.h>
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+    extern "C" {
+#endif
+/* *INDENT-ON* */
+
 #if ( ipconfigUSE_DNS != 0 )
 
 /** @brief Flag DNS parsing errors in situations where an IPv4 address is the return
@@ -87,4 +94,11 @@
                              size_t * uxBytesRead );
 
 #endif /* if ( ipconfigUSE_DNS != 0 ) */
-#endif /* ifndef FREERTOS_DNS_PARSER_H */
+
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+    } /* extern "C" */
+#endif
+/* *INDENT-ON* */
+
+#endif /* FREERTOS_DNS_PARSER_H */
diff --git a/source/include/FreeRTOS_IPv4.h b/source/include/FreeRTOS_IPv4.h
index c7d15af90..318ce5c05 100644
--- a/source/include/FreeRTOS_IPv4.h
+++ b/source/include/FreeRTOS_IPv4.h
@@ -113,4 +113,4 @@ enum eFrameProcessingResult prvCheckIP4HeaderOptions( struct xNETWORK_BUFFER * c
 #endif
 /* *INDENT-ON* */
 
-#endif /* FREERTOS_IP_H */
+#endif /* FREERTOS_IPV4_H */
diff --git a/source/include/FreeRTOS_IPv4_Private.h b/source/include/FreeRTOS_IPv4_Private.h
index dba8e4ef1..bb09c801b 100644
--- a/source/include/FreeRTOS_IPv4_Private.h
+++ b/source/include/FreeRTOS_IPv4_Private.h
@@ -131,4 +131,4 @@ typedef struct xTCP_PACKET TCPPacket_t;
 #endif
 /* *INDENT-ON* */
 
-#endif /* FREERTOS_IP_PRIVATE_H */
+#endif /* FREERTOS_IPV4_PRIVATE_H */
diff --git a/source/include/FreeRTOS_IPv4_Sockets.h b/source/include/FreeRTOS_IPv4_Sockets.h
index 731f801fd..0d6ef3221 100644
--- a/source/include/FreeRTOS_IPv4_Sockets.h
+++ b/source/include/FreeRTOS_IPv4_Sockets.h
@@ -53,6 +53,7 @@
                               struct freertos_sockaddr * pxSourceAddress );
 
     #ifdef __cplusplus
-}         /* extern "C" */
+}     /* extern "C" */
     #endif
+
 #endif /* FREERTOS_IPV4_SOCKETS_H */
diff --git a/source/include/FreeRTOS_IPv4_Utils.h b/source/include/FreeRTOS_IPv4_Utils.h
index 402497af7..0ac2f66ce 100644
--- a/source/include/FreeRTOS_IPv4_Utils.h
+++ b/source/include/FreeRTOS_IPv4_Utils.h
@@ -64,4 +64,4 @@ BaseType_t prvChecksumIPv4Checks( uint8_t * pucEthernetBuffer,
 #endif
 /* *INDENT-ON* */
 
-#endif /* FREERTOS_IP_UTILS_H */
+#endif /* FREERTOS_IPV4_UTILS_H */
diff --git a/source/include/FreeRTOS_IPv6.h b/source/include/FreeRTOS_IPv6.h
index 4a67c856f..0706a7dac 100644
--- a/source/include/FreeRTOS_IPv6.h
+++ b/source/include/FreeRTOS_IPv6.h
@@ -129,8 +129,8 @@ BaseType_t xGetExtensionOrder( uint8_t ucProtocol,
 
 /* *INDENT-OFF* */
 #ifdef __cplusplus
-    }         /* extern "C" */
+    } /* extern "C" */
 #endif
 /* *INDENT-ON* */
 
-#endif /* FREERTOS_IP_H */
+#endif /* FREERTOS_IPV6_H */
diff --git a/source/include/FreeRTOS_IPv6_Private.h b/source/include/FreeRTOS_IPv6_Private.h
index 2dc25f5b5..5d48f186e 100644
--- a/source/include/FreeRTOS_IPv6_Private.h
+++ b/source/include/FreeRTOS_IPv6_Private.h
@@ -271,4 +271,4 @@ eFrameProcessingResult_t prvProcessICMPMessage_IPv6( NetworkBufferDescriptor_t *
 #endif
 /* *INDENT-ON* */
 
-#endif /* FREERTOS_IP_PRIVATE_H */
+#endif /* FREERTOS_IPV6_PRIVATE_H */
diff --git a/source/include/FreeRTOS_IPv6_Sockets.h b/source/include/FreeRTOS_IPv6_Sockets.h
index 53ed71677..e435affc6 100644
--- a/source/include/FreeRTOS_IPv6_Sockets.h
+++ b/source/include/FreeRTOS_IPv6_Sockets.h
@@ -119,7 +119,7 @@
                               struct freertos_sockaddr * pxSourceAddress );
 
     #ifdef __cplusplus
-}         /* extern "C" */
+}     /* extern "C" */
     #endif
 
 #endif /* FREERTOS_IPV6_SOCKETS_H */
diff --git a/source/include/FreeRTOS_IPv6_Utils.h b/source/include/FreeRTOS_IPv6_Utils.h
index ffa742e78..34f23e985 100644
--- a/source/include/FreeRTOS_IPv6_Utils.h
+++ b/source/include/FreeRTOS_IPv6_Utils.h
@@ -72,4 +72,4 @@ size_t usGetExtensionHeaderLength( const uint8_t * pucEthernetBuffer,
 #endif
 /* *INDENT-ON* */
 
-#endif /* FREERTOS_IP_UTILS_H */
+#endif /* FREERTOS_IPV6_UTILS_H */
diff --git a/source/include/FreeRTOS_ND.h b/source/include/FreeRTOS_ND.h
index 475973b65..e1419f511 100644
--- a/source/include/FreeRTOS_ND.h
+++ b/source/include/FreeRTOS_ND.h
@@ -210,7 +210,7 @@
 
 /* *INDENT-OFF* */
 #ifdef __cplusplus
-    }
+    } /* extern "C" */
 #endif
 /* *INDENT-ON* */
 
diff --git a/source/include/FreeRTOS_Routing.h b/source/include/FreeRTOS_Routing.h
index ddf75233b..8b480d8f6 100644
--- a/source/include/FreeRTOS_Routing.h
+++ b/source/include/FreeRTOS_Routing.h
@@ -348,7 +348,7 @@
     #endif
 
     #ifdef __cplusplus
-}         /* extern "C" */
+}     /* extern "C" */
     #endif
 
 #endif /* FREERTOS_ROUTING_H */
diff --git a/source/include/FreeRTOS_Sockets.h b/source/include/FreeRTOS_Sockets.h
index d5c811f49..60b127e3e 100644
--- a/source/include/FreeRTOS_Sockets.h
+++ b/source/include/FreeRTOS_Sockets.h
@@ -590,7 +590,7 @@
     #endif
 
     #ifdef __cplusplus
-}         /* extern "C" */
+}     /* extern "C" */
     #endif
 
 #endif /* FREERTOS_SOCKETS_H */
diff --git a/source/include/FreeRTOS_errno_TCP.h b/source/include/FreeRTOS_errno_TCP.h
index 688eec5d0..5658cff9d 100644
--- a/source/include/FreeRTOS_errno_TCP.h
+++ b/source/include/FreeRTOS_errno_TCP.h
@@ -28,6 +28,12 @@
 #ifndef FREERTOS_ERRNO_TCP
 #define FREERTOS_ERRNO_TCP
 
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+    extern "C" {
+#endif
+/* *INDENT-ON* */
+
 /* The following definitions will be included in the core FreeRTOS code in
  * future versions of FreeRTOS - hence the 'pd' (ProjDefs) prefix - at which time
  * this file will be removed. */
@@ -95,4 +101,10 @@ const char * FreeRTOS_strerror_r( BaseType_t xErrnum,
                                   char * pcBuffer,
                                   size_t uxLength );
 
+/* *INDENT-OFF* */
+#ifdef __cplusplus
+    } /* extern "C" */
+#endif
+/* *INDENT-ON* */
+
 #endif /* FREERTOS_ERRNO_TCP */
diff --git a/source/portable/NetworkInterface/ATSAM4E/ethernet_phy.c b/source/portable/NetworkInterface/ATSAM4E/ethernet_phy.c
index 92e7b6ec6..035c9760e 100644
--- a/source/portable/NetworkInterface/ATSAM4E/ethernet_phy.c
+++ b/source/portable/NetworkInterface/ATSAM4E/ethernet_phy.c
@@ -54,11 +54,11 @@
 #include "instance/gmac.h"
 
 /*/ @cond 0 */
-/**INDENT-OFF**/
+/* *INDENT-OFF* */
 #ifdef __cplusplus
-extern "C" {
+    extern "C" {
 #endif
-/**INDENT-ON**/
+/* *INDENT-ON* */
 /*/ @endcond */
 
 /**
@@ -506,11 +506,11 @@ uint8_t ethernet_phy_reset( Gmac * p_gmac,
 }
 
 /*/ @cond 0 */
-/**INDENT-OFF**/
+/* *INDENT-OFF* */
 #ifdef __cplusplus
-}
+    } /* extern "C" */
 #endif
-/**INDENT-ON**/
+/* *INDENT-ON* */
 /*/ @endcond */
 
 /**
diff --git a/source/portable/NetworkInterface/ATSAM4E/ethernet_phy.h b/source/portable/NetworkInterface/ATSAM4E/ethernet_phy.h
index bcc4b77d4..b7479b3a4 100644
--- a/source/portable/NetworkInterface/ATSAM4E/ethernet_phy.h
+++ b/source/portable/NetworkInterface/ATSAM4E/ethernet_phy.h
@@ -281,7 +281,7 @@
     extern PhyProps_t phy_props;
 
     #ifdef __cplusplus
-}         /* extern "C" */
+}     /* extern "C" */
     #endif
 
 #endif /* #ifndef ETHERNET_PHY_H_INCLUDED */
diff --git a/source/portable/NetworkInterface/ATSAM4E/gmac.c b/source/portable/NetworkInterface/ATSAM4E/gmac.c
index 68bb254ca..7322ec5a0 100644
--- a/source/portable/NetworkInterface/ATSAM4E/gmac.c
+++ b/source/portable/NetworkInterface/ATSAM4E/gmac.c
@@ -58,11 +58,9 @@
 #include "ethernet_phy.h"
 
 /*/ @cond 0 */
-/**INDENT-OFF**/
 #ifdef __cplusplus
 extern "C" {
 #endif
-/**INDENT-ON**/
 /*/ @endcond */
 
 #ifndef ARRAY_SIZE
@@ -1028,9 +1026,7 @@ void gmac_handler( gmac_device_t * p_gmac_dev )
 /*@} */
 
 /*/ @cond 0 */
-/**INDENT-OFF**/
 #ifdef __cplusplus
-}
+}     /* extern "C" */
 #endif
-/**INDENT-ON**/
 /*/ @endcond */
diff --git a/source/portable/NetworkInterface/ATSAM4E/gmac.h b/source/portable/NetworkInterface/ATSAM4E/gmac.h
index 967ed868d..83be79d72 100644
--- a/source/portable/NetworkInterface/ATSAM4E/gmac.h
+++ b/source/portable/NetworkInterface/ATSAM4E/gmac.h
@@ -47,11 +47,9 @@
     #include "compiler.h"
 
 /*/ @cond 0 */
-/**INDENT-OFF**/
     #ifdef __cplusplus
     extern "C" {
     #endif
-/**INDENT-ON**/
 /*/ @endcond */
 
 /** The buffer addresses written into the descriptors must be aligned, so the
@@ -1228,11 +1226,9 @@
     void gmac_handler( gmac_device_t * p_gmac_dev );
 
 /*/ @cond 0 */
-/**INDENT-OFF**/
     #ifdef __cplusplus
-}
+}     /* extern "C" */
     #endif
-/**INDENT-ON**/
 /*/ @endcond */
 
 /**
diff --git a/source/portable/NetworkInterface/ATSAM4E/instance/gmac.h b/source/portable/NetworkInterface/ATSAM4E/instance/gmac.h
index 814bea15f..2ae76a653 100644
--- a/source/portable/NetworkInterface/ATSAM4E/instance/gmac.h
+++ b/source/portable/NetworkInterface/ATSAM4E/instance/gmac.h
@@ -48,11 +48,9 @@
     #include "component/gmac.h"
 
 /*/ @cond 0 */
-/**INDENT-OFF**/
     #ifdef __cplusplus
     extern "C" {
     #endif
-/**INDENT-ON**/
 /*/ @endcond */
 
 /** The buffer addresses written into the descriptors must be aligned, so the
@@ -1232,11 +1230,9 @@
     void gmac_handler( gmac_device_t * p_gmac_dev );
 
 /*/ @cond 0 */
-/**INDENT-OFF**/
     #ifdef __cplusplus
-}
+}     /* extern "C" */
     #endif
-/**INDENT-ON**/
 /*/ @endcond */
 
 /**
diff --git a/source/portable/NetworkInterface/DriverSAM/gmac_SAM.c b/source/portable/NetworkInterface/DriverSAM/gmac_SAM.c
index 6fe1fb6f7..e43924b2c 100644
--- a/source/portable/NetworkInterface/DriverSAM/gmac_SAM.c
+++ b/source/portable/NetworkInterface/DriverSAM/gmac_SAM.c
@@ -77,11 +77,11 @@
 #endif
 
 /*/ @cond 0 */
-/**INDENT-OFF**/
+/* *INDENT-OFF* */
 #ifdef __cplusplus
-extern "C" {
+    extern "C" {
 #endif
-/**INDENT-ON**/
+/* *INDENT-ON* */
 /*/ @endcond */
 
 #ifndef ARRAY_SIZE
@@ -1015,9 +1015,9 @@ void gmac_handler( gmac_device_t * p_gmac_dev )
 /*@} */
 
 /*/ @cond 0 */
-/**INDENT-OFF**/
+/* *INDENT-OFF* */
 #ifdef __cplusplus
-}
+    } /* extern "C" */
 #endif
-/**INDENT-ON**/
+/* *INDENT-ON* */
 /*/ @endcond */
diff --git a/source/portable/NetworkInterface/DriverSAM/gmac_SAM.h b/source/portable/NetworkInterface/DriverSAM/gmac_SAM.h
index 3b6512f9e..0f6a3e9ca 100644
--- a/source/portable/NetworkInterface/DriverSAM/gmac_SAM.h
+++ b/source/portable/NetworkInterface/DriverSAM/gmac_SAM.h
@@ -51,11 +51,9 @@
     #include "compiler.h"
 
 /*/ @cond 0 */
-/**INDENT-OFF**/
     #ifdef __cplusplus
     extern "C" {
     #endif
-/**INDENT-ON**/
 /*/ @endcond */
 
 /** The buffer addresses written into the descriptors must be aligned, so the
@@ -1545,11 +1543,9 @@
                                        size_t uxLength );
 
 /*/ @cond 0 */
-/**INDENT-OFF**/
     #ifdef __cplusplus
-}
+}     /* extern "C" */
     #endif
-/**INDENT-ON**/
 /*/ @endcond */
 
     #ifndef GMAC_STATS
diff --git a/source/portable/NetworkInterface/MPS2_AN385/ether_lan9118/smsc9220_eth_drv.h b/source/portable/NetworkInterface/MPS2_AN385/ether_lan9118/smsc9220_eth_drv.h
index ee587b3c6..72d383fb7 100644
--- a/source/portable/NetworkInterface/MPS2_AN385/ether_lan9118/smsc9220_eth_drv.h
+++ b/source/portable/NetworkInterface/MPS2_AN385/ether_lan9118/smsc9220_eth_drv.h
@@ -541,7 +541,7 @@
                                              smsc9220_eth_dev_t * dev );
 
     #ifdef __cplusplus
-}
+}     /* extern "C" */
     #endif
 
 #endif /* __SMSC9220_ETH_H__ */
diff --git a/source/portable/NetworkInterface/MPS3_AN552/CMSIS_Driver/Driver_ETH_MAC.h b/source/portable/NetworkInterface/MPS3_AN552/CMSIS_Driver/Driver_ETH_MAC.h
index 865ccb804..1ea68d9d6 100644
--- a/source/portable/NetworkInterface/MPS3_AN552/CMSIS_Driver/Driver_ETH_MAC.h
+++ b/source/portable/NetworkInterface/MPS3_AN552/CMSIS_Driver/Driver_ETH_MAC.h
@@ -61,8 +61,7 @@
 #define DRIVER_ETH_MAC_H_
 
 #ifdef  __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
 
 #include "Driver_ETH.h"
@@ -310,7 +309,7 @@ typedef struct _ARM_DRIVER_ETH_MAC {
 } const ARM_DRIVER_ETH_MAC;
 
 #ifdef  __cplusplus
-}
+} /* extern "C" */
 #endif
 
 #endif /* DRIVER_ETH_MAC_H_ */
diff --git a/source/portable/NetworkInterface/MPS3_AN552/CMSIS_Driver/Driver_ETH_PHY.h b/source/portable/NetworkInterface/MPS3_AN552/CMSIS_Driver/Driver_ETH_PHY.h
index d6ca30e61..27e39b758 100644
--- a/source/portable/NetworkInterface/MPS3_AN552/CMSIS_Driver/Driver_ETH_PHY.h
+++ b/source/portable/NetworkInterface/MPS3_AN552/CMSIS_Driver/Driver_ETH_PHY.h
@@ -143,7 +143,7 @@ typedef struct _ARM_DRIVER_ETH_PHY {
 } const ARM_DRIVER_ETH_PHY;
 
 #ifdef  __cplusplus
-}
+} /* extern "C" */
 #endif
 
 #endif /* DRIVER_ETH_PHY_H_ */
diff --git a/source/portable/NetworkInterface/MPS3_AN552/Device/Include/SSE300MPS3.h b/source/portable/NetworkInterface/MPS3_AN552/Device/Include/SSE300MPS3.h
old mode 100755
new mode 100644
index bd741ec62..7debb31db
--- a/source/portable/NetworkInterface/MPS3_AN552/Device/Include/SSE300MPS3.h
+++ b/source/portable/NetworkInterface/MPS3_AN552/Device/Include/SSE300MPS3.h
@@ -92,7 +92,7 @@ extern "C" {
 #endif
 
 #ifdef __cplusplus
-}
+} /* extern "C" */
 #endif
 
 #endif /* __AN552_H__ */
diff --git a/source/portable/NetworkInterface/MPS3_AN552/Device/Include/core_cm55.h b/source/portable/NetworkInterface/MPS3_AN552/Device/Include/core_cm55.h
index bc49aa565..c5e524da8 100644
--- a/source/portable/NetworkInterface/MPS3_AN552/Device/Include/core_cm55.h
+++ b/source/portable/NetworkInterface/MPS3_AN552/Device/Include/core_cm55.h
@@ -215,7 +215,7 @@
 
 
 #ifdef __cplusplus
-}
+} /* extern "C" */
 #endif
 
 #endif /* __CORE_CM55_H_GENERIC */
@@ -4910,7 +4910,7 @@ __STATIC_INLINE int32_t ITM_CheckChar (void)
 
 
 #ifdef __cplusplus
-}
+} /* extern "C" */
 #endif
 
 #endif /* __CORE_CM55_H_DEPENDANT */
diff --git a/source/portable/NetworkInterface/MPS3_AN552/Device/Include/system_SSE300MPS3.h b/source/portable/NetworkInterface/MPS3_AN552/Device/Include/system_SSE300MPS3.h
old mode 100755
new mode 100644
index 0aa08214a..81b2d4f54
--- a/source/portable/NetworkInterface/MPS3_AN552/Device/Include/system_SSE300MPS3.h
+++ b/source/portable/NetworkInterface/MPS3_AN552/Device/Include/system_SSE300MPS3.h
@@ -1,5 +1,3 @@
-/* *INDENT-OFF* */
-
 /*
  * Copyright (c) 2009-2020 Arm Limited
  *
@@ -23,34 +21,36 @@
 
 /* This file is a copy of
  * https://gitlab.arm.com/iot/open-iot-sdk/arm-corstone-platform-bsp/-/blob/main/corstone300/Device/Include/system_SSE300MPS3.h
-*/
+ */
 
 #ifndef __SYSTEM_CORE_INIT_H__
 #define __SYSTEM_CORE_INIT_H__
 
 #include <stdint.h>
 
+/* *INDENT-OFF* */
 #ifdef __cplusplus
-extern "C" {
+    extern "C" {
 #endif
+/* *INDENT-ON* */
 
-extern uint32_t SystemCoreClock;  /*!< System Clock Frequency (Core Clock)  */
-extern uint32_t PeripheralClock;  /*!< Peripheral Clock Frequency */
+extern uint32_t SystemCoreClock; /*!< System Clock Frequency (Core Clock)  */
+extern uint32_t PeripheralClock; /*!< Peripheral Clock Frequency */
 
 /**
  * \brief  Initializes the system
  */
-extern void SystemInit(void);
+extern void SystemInit( void );
 
 /**
  * \brief  Restores system core clock
  */
-extern void SystemCoreClockUpdate(void);
+extern void SystemCoreClockUpdate( void );
 
+/* *INDENT-OFF* */
 #ifdef __cplusplus
-}
+    } /* extern "C" */
 #endif
+/* *INDENT-ON* */
 
 #endif /* __SYSTEM_CORE_INIT_H__ */
-
-/* *INDENT-ON* */
diff --git a/source/portable/NetworkInterface/STM32Fxx/stm32fxx_hal_eth.h b/source/portable/NetworkInterface/STM32Fxx/stm32fxx_hal_eth.h
index 6f0f684ed..110c0184c 100644
--- a/source/portable/NetworkInterface/STM32Fxx/stm32fxx_hal_eth.h
+++ b/source/portable/NetworkInterface/STM32Fxx/stm32fxx_hal_eth.h
@@ -2404,7 +2404,7 @@
  * @}
  */
     #ifdef __cplusplus
-}
+}     /* extern "C" */
     #endif
 
 #endif /* __STM32Fxx_HAL_ETH_H */
diff --git a/source/portable/NetworkInterface/STM32Hxx/stm32hxx_hal_eth.h b/source/portable/NetworkInterface/STM32Hxx/stm32hxx_hal_eth.h
index a8a6cc3b4..cfc0e6298 100644
--- a/source/portable/NetworkInterface/STM32Hxx/stm32hxx_hal_eth.h
+++ b/source/portable/NetworkInterface/STM32Hxx/stm32hxx_hal_eth.h
@@ -1865,7 +1865,7 @@
     #endif /* ETH */
 
     #ifdef __cplusplus
-}
+}     /* extern "C" */
     #endif
 
 #endif /* STM32Hxx_HAL_ETH_H */
diff --git a/source/portable/NetworkInterface/Zynq/x_emacpsif.h b/source/portable/NetworkInterface/Zynq/x_emacpsif.h
index ab3d8423d..378431f06 100644
--- a/source/portable/NetworkInterface/Zynq/x_emacpsif.h
+++ b/source/portable/NetworkInterface/Zynq/x_emacpsif.h
@@ -151,7 +151,7 @@
     void vInitialiseOnIndex( BaseType_t xIndex );
 
     #ifdef __cplusplus
-}
+}     /* extern "C" */
     #endif
 
 #endif /* __NETIF_XAXIEMACIF_H__ */
diff --git a/source/portable/NetworkInterface/Zynq/x_emacpsif_hw.h b/source/portable/NetworkInterface/Zynq/x_emacpsif_hw.h
index 8dd594ae8..086734acb 100644
--- a/source/portable/NetworkInterface/Zynq/x_emacpsif_hw.h
+++ b/source/portable/NetworkInterface/Zynq/x_emacpsif_hw.h
@@ -33,7 +33,7 @@
     int emacps_check_errors( xemacpsif_s * xemacps );
 
     #ifdef __cplusplus
-}
+}     /* extern "C" */
     #endif
 
-#endif /* ifndef __XEMACPSIF_HW_H_ */
+#endif /* __XEMACPSIF_HW_H_ */
diff --git a/source/portable/NetworkInterface/Zynq/x_topology.h b/source/portable/NetworkInterface/Zynq/x_topology.h
index 540818827..f09d1126d 100644
--- a/source/portable/NetworkInterface/Zynq/x_topology.h
+++ b/source/portable/NetworkInterface/Zynq/x_topology.h
@@ -41,7 +41,7 @@
     extern struct xtopology_t xXTopologies[ XPAR_XEMACPS_NUM_INSTANCES ];
 
     #ifdef __cplusplus
-}
+}     /* extern "C" */
     #endif
 
-#endif /* ifndef __XTOPOLOGY_H_ */
+#endif /* __XTOPOLOGY_H_ */
diff --git a/source/portable/NetworkInterface/include/phyHandling.h b/source/portable/NetworkInterface/include/phyHandling.h
index adf1ceb3e..ff266cf39 100644
--- a/source/portable/NetworkInterface/include/phyHandling.h
+++ b/source/portable/NetworkInterface/include/phyHandling.h
@@ -155,7 +155,7 @@
     ( ( ( ( uint32_t ) 1u ) << ( pxPhyObject )->xPortCount ) - 1u )
 
     #ifdef __cplusplus
-}         /* extern "C" */
+}     /* extern "C" */
     #endif
 
-#endif /* ifndef PHYHANDLING_H */
+#endif /* PHYHANDLING_H */
diff --git a/source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif.h b/source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif.h
index 66c64f87e..12522e564 100644
--- a/source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif.h
+++ b/source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif.h
@@ -151,7 +151,7 @@
     void resetrx_on_no_rxdata( xemacpsif_s * xemacpsif );
 
     #ifdef __cplusplus
-}
+}     /* extern "C" */
     #endif
 
 #endif /* __NETIF_XAXIEMACIF_H__ */
diff --git a/source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_hw.h b/source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_hw.h
index efc30a91b..7656579f6 100644
--- a/source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_hw.h
+++ b/source/portable/NetworkInterface/xilinx_ultrascale/x_emacpsif_hw.h
@@ -37,7 +37,7 @@
 
 
     #ifdef __cplusplus
-}
+}     /* extern "C" */
     #endif
 
 #endif /* ifndef __XEMACPSIF_HW_H_ */
diff --git a/source/portable/NetworkInterface/xilinx_ultrascale/x_topology.h b/source/portable/NetworkInterface/xilinx_ultrascale/x_topology.h
index 2f22a4fd0..2ed411c79 100644
--- a/source/portable/NetworkInterface/xilinx_ultrascale/x_topology.h
+++ b/source/portable/NetworkInterface/xilinx_ultrascale/x_topology.h
@@ -44,7 +44,7 @@
     int x_topology_find_index( unsigned base );
 
     #ifdef __cplusplus
-}
+}     /* extern "C" */
     #endif
 
-#endif /* ifndef __XTOPOLOGY_H_ */
+#endif /* __XTOPOLOGY_H_ */