4 files changed, 14 insertions, 15 deletions
diff --git a/include/bl32/payloads/tlk.h b/include/bl32/payloads/tlk.h
index 941b6cc0c..0234cbe4d 100644
--- a/include/bl32/payloads/tlk.h
+++ b/include/bl32/payloads/tlk.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TLK_H__
-#define __TLK_H__
+#ifndef TLK_H
+#define TLK_H
 
 #include <utils_def.h>
 
@@ -63,4 +63,4 @@
 #define TOS_UID			0xbf00ff01 /* Implementation UID */
 #define TOS_CALL_VERSION	0xbf00ff03 /* Trusted OS Call Version */
 
-#endif /* __TLK_H__ */
+#endif /* TLK_H */
diff --git a/include/bl32/sp_min/platform_sp_min.h b/include/bl32/sp_min/platform_sp_min.h
index 2d71a4798..feb4ec371 100644
--- a/include/bl32/sp_min/platform_sp_min.h
+++ b/include/bl32/sp_min/platform_sp_min.h
@@ -4,8 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLATFORM_SP_MIN_H__
-#define __PLATFORM_SP_MIN_H__
+#ifndef PLATFORM_SP_MIN_H
+#define PLATFORM_SP_MIN_H
+
+#include <stdint.h>
 
 /*******************************************************************************
  * Mandatory SP_MIN functions
@@ -20,4 +22,4 @@ entry_point_info_t *sp_min_plat_get_bl33_ep_info(void);
 /* Platforms that enable SP_MIN_WITH_SECURE_FIQ shall implement this api */
 void sp_min_plat_fiq_handler(uint32_t id);
 
-#endif /* __PLATFORM_SP_MIN_H__ */
+#endif /* PLATFORM_SP_MIN_H */
diff --git a/include/bl32/tsp/platform_tsp.h b/include/bl32/tsp/platform_tsp.h
index a5a0223c8..fe8a2c933 100644
--- a/include/bl32/tsp/platform_tsp.h
+++ b/include/bl32/tsp/platform_tsp.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __PLATFORM_TSP_H__
-
+#ifndef PLATFORM_TSP_H
+#define PLATFORM_TSP_H
 
 /*******************************************************************************
  * Mandatory TSP functions (only if platform contains a TSP)
@@ -14,7 +14,4 @@ void tsp_early_platform_setup(void);
 void tsp_plat_arch_setup(void);
 void tsp_platform_setup(void);
 
-
-#define __PLATFORM_H__
-
-#endif
+#endif /* PLATFORM_TSP_H */
diff --git a/include/bl32/tsp/tsp.h b/include/bl32/tsp/tsp.h
index 43bba8f5e..ed4792e58 100644
--- a/include/bl32/tsp/tsp.h
+++ b/include/bl32/tsp/tsp.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __TSP_H__
-#define __TSP_H__
+#ifndef TSP_H
+#define TSP_H
 
 /*
  * SMC function IDs that TSP uses to signal various forms of completions
@@ -107,4 +107,4 @@ typedef struct tsp_vectors {
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __TSP_H__ */
+#endif /* TSP_H */