diff --git a/include/optee_include/258be795-f9ca-40e6-a8699ce6886c5d5d.h b/include/optee_include/258be795-f9ca-40e6-a8699ce6886c5d5d.h
index a1df9239ed..2e07fbb105 100644
--- a/include/optee_include/258be795-f9ca-40e6-a8699ce6886c5d5d.h
+++ b/include/optee_include/258be795-f9ca-40e6-a8699ce6886c5d5d.h
@@ -3,6 +3,10 @@
  *
  * SPDX-License-Identifier:     GPL-2.0+
  */
+#ifndef _KEYMASTER_TA_H_
+#define _KEYMASTER_TA_H_
 
 extern const uint8_t keymaster_data[];
 extern const uint32_t keymaster_size;
+
+#endif /* _KEYMASTER_TA_H_ */
diff --git a/include/optee_include/OpteeClientApiLib.h b/include/optee_include/OpteeClientApiLib.h
index a88565fbff..8c68643e29 100644
--- a/include/optee_include/OpteeClientApiLib.h
+++ b/include/optee_include/OpteeClientApiLib.h
@@ -4,7 +4,12 @@
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
+#ifndef _OPTEE_CLIENT_APILIB_H_
+#define _OPTEE_CLIENT_APILIB_H_
+
 #include <optee_include/tee_base_types.h>
 #include <optee_include/tee_client_api.h>
 
 TEEC_Result OpteeClientApiLibInitialize(void);
+
+#endif /*_OPTEE_CLIENT_APILIB_H_*/
diff --git a/include/optee_include/OpteeClientImage.h b/include/optee_include/OpteeClientImage.h
index d18928480a..e67142cefc 100644
--- a/include/optee_include/OpteeClientImage.h
+++ b/include/optee_include/OpteeClientImage.h
@@ -14,4 +14,5 @@
 	0xee3206cb, 0x950a, 0x49eb, \
 	{ 0xbd, 0xd7, 0xc1, 0x95, 0xcb, 0x9b, 0x2e, 0xbf } \
 }
+
 #endif
diff --git a/include/optee_include/OpteeClientMem.h b/include/optee_include/OpteeClientMem.h
index 2e4c877b36..ba85f829c3 100644
--- a/include/optee_include/OpteeClientMem.h
+++ b/include/optee_include/OpteeClientMem.h
@@ -4,6 +4,8 @@
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
+#ifndef _OPTEE_CLIENT_MEM_H_
+#define _OPTEE_CLIENT_MEM_H_
 
 #include <linux/types.h>
 
@@ -12,3 +14,5 @@ void OpteeClientMemInit(void);
 void *OpteeClientMemAlloc(uint32_t length);
 
 void  OpteeClientMemFree(void *mem);
+
+#endif /*_OPTEE_CLIENT_MEM_H_*/
diff --git a/include/optee_include/OpteeClientRPC.h b/include/optee_include/OpteeClientRPC.h
index 3efa427d37..b4a3574532 100644
--- a/include/optee_include/OpteeClientRPC.h
+++ b/include/optee_include/OpteeClientRPC.h
@@ -4,6 +4,9 @@
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
+#ifndef _OPTEE_CLIENT_RPC_H_
+#define _OPTEE_CLIENT_RPC_H_
+
 #include <optee_include/tee_base_types.h>
 #include <optee_include/OpteeClientApiLib.h>
 
@@ -51,3 +54,5 @@ typedef struct s_rpmb_back {
 } EFI_RK_RPMB_DATA_PACKET_BACK;
 
 TEEC_Result OpteeRpcCallback(ARM_SMC_ARGS *ArmSmcArgs);
+
+#endif /*_OPTEE_CLIENT_RPC_H_*/
diff --git a/include/optee_include/OpteeClientSMC.h b/include/optee_include/OpteeClientSMC.h
index 2bbcbe9063..d8b8bb2e1f 100644
--- a/include/optee_include/OpteeClientSMC.h
+++ b/include/optee_include/OpteeClientSMC.h
@@ -4,6 +4,8 @@
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
+#ifndef _OPTEE_CLIENT_SMC_H_
+#define _OPTEE_CLIENT_SMC_H_
 
 #include <optee_include/tee_base_types.h>
 #include <optee_include/OpteeClientApiLib.h>
@@ -24,3 +26,5 @@ TEEC_Result TEEC_SMC_InvokeCommand(TEEC_Session *session,
 
 TEEC_Result TEEC_SMC_RequestCancellation(TEEC_Operation *operation,
 				uint32_t *error_origin);
+
+#endif /*_OPTEE_CLIENT_SMC_H_*/