diff --git a/features/nfc/nfc/NFCController.h b/features/nfc/nfc/NFCController.h
index fffb5e1ab2..945d248811 100644
--- a/features/nfc/nfc/NFCController.h
+++ b/features/nfc/nfc/NFCController.h
@@ -1,4 +1,6 @@
-/* mbed Microcontroller Library
+/** @file NFCController.h
+ *
+ * mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,15 +33,14 @@
 namespace mbed {
 namespace nfc {
 
+/** @addtogroup nfc
+ * @{
+ */
+
 class NFCRemoteInitiator;
 class NFCRemoteTarget;
 class NFCControllerDriver;
 
-/**
- * @addtogroup nfc
- * @{
- */
-
 /**
  * This class represents a NFC Controller.
  *
@@ -178,11 +179,7 @@ private:
     bool _discovery_running;
     Span<uint8_t> _ndef_buffer;
 };
-
-/**
- * @}
- */
-
+/** @}*/
 } // namespace nfc
 } // namespace mbed
 
diff --git a/features/nfc/nfc/NFCEEPROM.h b/features/nfc/nfc/NFCEEPROM.h
index 1e940c745a..b06c2836a7 100644
--- a/features/nfc/nfc/NFCEEPROM.h
+++ b/features/nfc/nfc/NFCEEPROM.h
@@ -1,4 +1,6 @@
-/* mbed Microcontroller Library
+/** @file NFCEEPROM.h
+ *
+ * mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,8 +29,7 @@
 namespace mbed {
 namespace nfc {
 
-/**
- * @addtogroup nfc
+/** @addtogroup nfc
  * @{
  */
 
@@ -153,12 +154,7 @@ private:
     uint32_t _eeprom_address;
     nfc_err_t _operation_result;
 };
-
-/**
- * @}
- */
-
-
+/** @}*/
 } // namespace nfc
 } // namespace mbed
 
diff --git a/features/nfc/nfc/ndef/MessageBuilder.h b/features/nfc/nfc/ndef/MessageBuilder.h
index 0b2437108e..2564675897 100644
--- a/features/nfc/nfc/ndef/MessageBuilder.h
+++ b/features/nfc/nfc/ndef/MessageBuilder.h
@@ -1,4 +1,6 @@
-/* mbed Microcontroller Library
+/** @file MessageBuilder.h
+ *
+ * mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,8 +29,7 @@ namespace mbed {
 namespace nfc {
 namespace ndef {
 
-/**
- * @addtogroup nfc
+/** @addtogroup nfc
  * @{
  */
 
@@ -189,11 +190,7 @@ private:
     bool _message_ended;
     bool _in_chunk;
 };
-
-/**
- * @}
- */
-
+/** @}*/
 } // namespace ndef
 } // namespace nfc
 } // namespace mbed
diff --git a/features/nfc/nfc/ndef/MessageParser.h b/features/nfc/nfc/ndef/MessageParser.h
index 41c4a9e3a3..55a0e6e5fd 100644
--- a/features/nfc/nfc/ndef/MessageParser.h
+++ b/features/nfc/nfc/ndef/MessageParser.h
@@ -1,4 +1,6 @@
-/* mbed Microcontroller Library
+/** @file MessageParser.h
+ *
+ * mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,19 +20,16 @@
 #define NFC_NDEF_MESSAGEPARSER_H_
 
 #include <stdlib.h>
-
 #include "platform/Span.h"
 
 namespace mbed {
 namespace nfc {
 namespace ndef {
 
-/**
- * @addtogroup nfc
+/** @addtogroup nfc
  * @{
  */
 
-
 // Forward declaration
 class Record;
 
@@ -165,11 +164,7 @@ private:
 
     Delegate *_delegate;
 };
-
-/**
- * @}
- */
-
+/** @}*/
 } // namespace ndef
 } // namespace nfc
 } // namespace mbed
diff --git a/features/nfc/nfc/ndef/common/SimpleMessageParser.h b/features/nfc/nfc/ndef/common/SimpleMessageParser.h
index a4da0049f9..7ba7e9db91 100644
--- a/features/nfc/nfc/ndef/common/SimpleMessageParser.h
+++ b/features/nfc/nfc/ndef/common/SimpleMessageParser.h
@@ -1,4 +1,6 @@
-/* mbed Microcontroller Library
+/** @file SimpleMessageParser.h
+ *
+ * mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,8 +32,7 @@ namespace nfc {
 namespace ndef {
 namespace common {
 
-/**
- * @addtogroup nfc
+/** @addtogroup nfc
  * @{
  */
 
@@ -161,14 +162,11 @@ private:
     MimeParser _mime_parser;
     Delegate *_delegate;
 };
-
-/**
- * @}
- */
-
+/** @}*/
 } // namespace common
 } // namespace ndef
 } // namespace nfc
 } // namespace mbed
 
 #endif /* NFC_COMMON_SIMPLEMESSAGEPARSER_H_ */
+