diff --git a/hal/can_api.h b/hal/can_api.h
index 39ac050adbb..9774d12b386 100644
--- a/hal/can_api.h
+++ b/hal/can_api.h
@@ -106,7 +106,7 @@ const PinMap *can_rd_pinmap(void);
 const PinMap *can_td_pinmap(void);
 
 #ifdef __cplusplus
-};
+}
 #endif
 
 #endif    // MBED_CAN_API_H
diff --git a/hal/can_helper.h b/hal/can_helper.h
index 5a117509fde..3f56f16c6fa 100644
--- a/hal/can_helper.h
+++ b/hal/can_helper.h
@@ -68,7 +68,7 @@ struct CAN_Message {
 typedef struct CAN_Message CAN_Message;
 
 #ifdef __cplusplus
-};
+}
 #endif
 
 #endif
diff --git a/hal/crc_api.h b/hal/crc_api.h
index 5cae61be90e..e59b6788c03 100644
--- a/hal/crc_api.h
+++ b/hal/crc_api.h
@@ -224,7 +224,7 @@ uint32_t hal_crc_get_result(void);
 /**@}*/
 
 #ifdef __cplusplus
-};
+}
 #endif
 
 #endif // DEVICE_CRC
diff --git a/platform/CircularBuffer.h b/platform/CircularBuffer.h
index 7678230279e..c167444f6ad 100644
--- a/platform/CircularBuffer.h
+++ b/platform/CircularBuffer.h
@@ -49,7 +49,7 @@ template<>
 struct is_unsigned<unsigned long long> {
     static const bool value = true;
 };
-};
+}
 
 /** \addtogroup platform-public-api */
 /** @{*/
diff --git a/platform/mbed_retarget.h b/platform/mbed_retarget.h
index 56c2d8b351a..247609122a1 100644
--- a/platform/mbed_retarget.h
+++ b/platform/mbed_retarget.h
@@ -592,7 +592,7 @@ extern "C" {
     int mkdir(const char *name, mode_t n);
 #endif // !MBED_CONF_PLATFORM_STDIO_MINIMAL_CONSOLE_ONLY
 #if __cplusplus
-}; // extern "C"
+} // extern "C"
 
 namespace mbed {
 #if !MBED_CONF_PLATFORM_STDIO_MINIMAL_CONSOLE_ONLY