diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/aes.h b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/aes.h
index cb6df14e4..aa636c7d4 100644
--- a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/aes.h
+++ b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/aes.h
@@ -46,8 +46,8 @@
  *              2) call tc_aes_encrypt/decrypt to process the data.
  */
 
-#ifndef __TC_AES_H__
-#define __TC_AES_H__
+#ifndef __BLE_MESH_TC_AES_H__
+#define __BLE_MESH_TC_AES_H__
 
 #include <stdint.h>
 
@@ -127,4 +127,4 @@ int tc_aes_decrypt(uint8_t *out, const uint8_t *in,
 }
 #endif
 
-#endif /* __TC_AES_H__ */
+#endif /* __BLE_MESH_TC_AES_H__ */
diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/cbc_mode.h b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/cbc_mode.h
index cb91b8732..4be3d95e5 100644
--- a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/cbc_mode.h
+++ b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/cbc_mode.h
@@ -71,8 +71,8 @@
  *
  */
 
-#ifndef __TC_CBC_MODE_H__
-#define __TC_CBC_MODE_H__
+#ifndef __BLE_MESH_TC_CBC_MODE_H__
+#define __BLE_MESH_TC_CBC_MODE_H__
 
 #include <tinycrypt/aes.h>
 
@@ -148,4 +148,4 @@ int tc_cbc_mode_decrypt(uint8_t *out, unsigned int outlen, const uint8_t *in,
 }
 #endif
 
-#endif /* __TC_CBC_MODE_H__ */
+#endif /* __BLE_MESH_TC_CBC_MODE_H__ */
diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ccm_mode.h b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ccm_mode.h
index c23a3881e..1f85c76e6 100644
--- a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ccm_mode.h
+++ b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ccm_mode.h
@@ -71,8 +71,8 @@
  *            3) call tc_ccm_mode_decrypt to decrypt data and verify tag.
  */
 
-#ifndef __TC_CCM_MODE_H__
-#define __TC_CCM_MODE_H__
+#ifndef __BLE_MESH_TC_CCM_MODE_H__
+#define __BLE_MESH_TC_CCM_MODE_H__
 
 #include <tinycrypt/aes.h>
 #include <stddef.h>
@@ -208,4 +208,4 @@ int tc_ccm_decryption_verification(uint8_t *out, unsigned int olen,
 }
 #endif
 
-#endif /* __TC_CCM_MODE_H__ */
+#endif /* __BLE_MESH_TC_CCM_MODE_H__ */
diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/cmac_mode.h b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/cmac_mode.h
index 90552de50..cf0b3601b 100644
--- a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/cmac_mode.h
+++ b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/cmac_mode.h
@@ -94,8 +94,8 @@
  *           tc_cmac_erase to accomplish this.
  */
 
-#ifndef __TC_CMAC_MODE_H__
-#define __TC_CMAC_MODE_H__
+#ifndef __BLE_MESH_TC_CMAC_MODE_H__
+#define __BLE_MESH_TC_CMAC_MODE_H__
 
 #include <tinycrypt/aes.h>
 
@@ -191,4 +191,4 @@ int tc_cmac_final(uint8_t *tag, TCCmacState_t s);
 }
 #endif
 
-#endif /* __TC_CMAC_MODE_H__ */
+#endif /* __BLE_MESH_TC_CMAC_MODE_H__ */
diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/constants.h b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/constants.h
index 965490e00..0abb01a15 100644
--- a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/constants.h
+++ b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/constants.h
@@ -36,8 +36,8 @@
  *
  */
 
-#ifndef __TC_CONSTANTS_H__
-#define __TC_CONSTANTS_H__
+#ifndef __BLE_MESH_TC_CONSTANTS_H__
+#define __BLE_MESH_TC_CONSTANTS_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -58,4 +58,4 @@ extern "C" {
 }
 #endif
 
-#endif /* __TC_CONSTANTS_H__ */
+#endif /* __BLE_MESH_TC_CONSTANTS_H__ */
diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ctr_mode.h b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ctr_mode.h
index 8a11747b3..039f58c86 100644
--- a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ctr_mode.h
+++ b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ctr_mode.h
@@ -64,8 +64,8 @@
  *
  */
 
-#ifndef __TC_CTR_MODE_H__
-#define __TC_CTR_MODE_H__
+#ifndef __BLE_MESH_TC_CTR_MODE_H__
+#define __BLE_MESH_TC_CTR_MODE_H__
 
 #include <tinycrypt/aes.h>
 #include <tinycrypt/constants.h>
@@ -105,4 +105,4 @@ int tc_ctr_mode(uint8_t *out, unsigned int outlen, const uint8_t *in,
 }
 #endif
 
-#endif /* __TC_CTR_MODE_H__ */
+#endif /* __BLE_MESH_TC_CTR_MODE_H__ */
diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ctr_prng.h b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ctr_prng.h
index 482ce5997..04e070d3e 100644
--- a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ctr_prng.h
+++ b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ctr_prng.h
@@ -56,8 +56,8 @@
  *              4) call tc_ctr_prng_uninstantiate to zero out the prng context
  */
 
-#ifndef __TC_CTR_PRNG_H__
-#define __TC_CTR_PRNG_H__
+#ifndef __BLE_MESH_TC_CTR_PRNG_H__
+#define __BLE_MESH_TC_CTR_PRNG_H__
 
 #include <tinycrypt/aes.h>
 
@@ -163,4 +163,4 @@ void tc_ctr_prng_uninstantiate(TCCtrPrng_t *const ctx);
 }
 #endif
 
-#endif /* __TC_CTR_PRNG_H__ */
+#endif /* __BLE_MESH_TC_CTR_PRNG_H__ */
diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc.h b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc.h
index 600286493..72ba652f2 100644
--- a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc.h
+++ b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc.h
@@ -68,8 +68,8 @@
  *
  */
 
-#ifndef __TC_UECC_H__
-#define __TC_UECC_H__
+#ifndef __BLE_MESH_TC_UECC_H__
+#define __BLE_MESH_TC_UECC_H__
 
 #include <stdint.h>
 
@@ -542,4 +542,4 @@ void uECC_vli_bytesToNative(unsigned int *native, const uint8_t *bytes,
 }
 #endif
 
-#endif /* __TC_UECC_H__ */
+#endif /* __BLE_MESH_TC_UECC_H__ */
diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_dh.h b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_dh.h
index 5d58a2e92..ba9a0ebb2 100644
--- a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_dh.h
+++ b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_dh.h
@@ -66,8 +66,8 @@
  *  Security: The curve NIST p-256 provides approximately 128 bits of security.
  */
 
-#ifndef __TC_ECC_DH_H__
-#define __TC_ECC_DH_H__
+#ifndef __BLE_MESH_TC_ECC_DH_H__
+#define __BLE_MESH_TC_ECC_DH_H__
 
 #include <tinycrypt/ecc.h>
 
@@ -128,4 +128,4 @@ int uECC_shared_secret(const uint8_t *p_public_key, const uint8_t *p_private_key
 }
 #endif
 
-#endif /* __TC_ECC_DH_H__ */
+#endif /* __BLE_MESH_TC_ECC_DH_H__ */
diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_dsa.h b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_dsa.h
index eb4eedae1..cfada859d 100644
--- a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_dsa.h
+++ b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_dsa.h
@@ -75,8 +75,8 @@
  *          the signer's public key and the signature values (r and s).
  */
 
-#ifndef __TC_ECC_DSA_H__
-#define __TC_ECC_DSA_H__
+#ifndef __BLE_MESH_TC_ECC_DSA_H__
+#define __BLE_MESH_TC_ECC_DSA_H__
 
 #include <tinycrypt/ecc.h>
 
@@ -136,4 +136,4 @@ int uECC_verify(const uint8_t *p_public_key, const uint8_t *p_message_hash,
 }
 #endif
 
-#endif /* __TC_ECC_DSA_H__ */
+#endif /* __BLE_MESH_TC_ECC_DSA_H__ */
diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_platform_specific.h b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_platform_specific.h
index e2c882356..25d725b93 100644
--- a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_platform_specific.h
+++ b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/ecc_platform_specific.h
@@ -55,8 +55,8 @@
  *  uECC_platform_specific.h -- Interface to platform specific functions
  */
 
-#ifndef __UECC_PLATFORM_SPECIFIC_H_
-#define __UECC_PLATFORM_SPECIFIC_H_
+#ifndef __BLE_MESH_UECC_PLATFORM_SPECIFIC_H_
+#define __BLE_MESH_UECC_PLATFORM_SPECIFIC_H_
 
 /*
  * The RNG function should fill 'size' random bytes into 'dest'. It should
@@ -78,4 +78,4 @@
 
 int default_CSPRNG(uint8_t *dest, unsigned int size);
 
-#endif /* __UECC_PLATFORM_SPECIFIC_H_ */
+#endif /* __BLE_MESH_UECC_PLATFORM_SPECIFIC_H_ */
diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/hmac.h b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/hmac.h
index ee32e4521..cb399d8d5 100644
--- a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/hmac.h
+++ b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/hmac.h
@@ -60,8 +60,8 @@
  *              4) call tc_hmac_final to out put the tag.
  */
 
-#ifndef __TC_HMAC_H__
-#define __TC_HMAC_H__
+#ifndef __BLE_MESH_TC_HMAC_H__
+#define __BLE_MESH_TC_HMAC_H__
 
 #include <tinycrypt/sha256.h>
 
@@ -136,4 +136,4 @@ int tc_hmac_final(uint8_t *tag, unsigned int taglen, TCHmacState_t ctx);
 }
 #endif
 
-#endif /*__TC_HMAC_H__*/
+#endif /*__BLE_MESH_TC_HMAC_H__*/
diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/hmac_prng.h b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/hmac_prng.h
index 49a188cf0..f7f900102 100644
--- a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/hmac_prng.h
+++ b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/hmac_prng.h
@@ -65,8 +65,8 @@
  *              3) call tc_hmac_prng_generate to out put the pseudo-random data.
  */
 
-#ifndef __TC_HMAC_PRNG_H__
-#define __TC_HMAC_PRNG_H__
+#ifndef __BLE_MESH_TC_HMAC_PRNG_H__
+#define __BLE_MESH_TC_HMAC_PRNG_H__
 
 #include <tinycrypt/sha256.h>
 #include <tinycrypt/hmac.h>
@@ -161,4 +161,4 @@ int tc_hmac_prng_generate(uint8_t *out, unsigned int outlen, TCHmacPrng_t prng);
 }
 #endif
 
-#endif /* __TC_HMAC_PRNG_H__ */
+#endif /* __BLE_MESH_TC_HMAC_PRNG_H__ */
diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/sha256.h b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/sha256.h
index 6a572731c..c57cb00ca 100644
--- a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/sha256.h
+++ b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/sha256.h
@@ -54,8 +54,8 @@
  *              operation.
  */
 
-#ifndef __TC_SHA256_H__
-#define __TC_SHA256_H__
+#ifndef __BLE_MESH_TC_SHA256_H__
+#define __BLE_MESH_TC_SHA256_H__
 
 #include <stddef.h>
 #include <stdint.h>
@@ -126,4 +126,4 @@ int tc_sha256_final(uint8_t *digest, TCSha256State_t s);
 }
 #endif
 
-#endif /* __TC_SHA256_H__ */
+#endif /* __BLE_MESH_TC_SHA256_H__ */
diff --git a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/utils.h b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/utils.h
index 4e1acc362..422892390 100644
--- a/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/utils.h
+++ b/components/bt/esp_ble_mesh/mesh_common/tinycrypt/include/tinycrypt/utils.h
@@ -36,8 +36,8 @@
  *
  */
 
-#ifndef __TC_UTILS_H__
-#define __TC_UTILS_H__
+#ifndef __BLE_MESH_TC_UTILS_H__
+#define __BLE_MESH_TC_UTILS_H__
 
 #include <stdint.h>
 #include <stddef.h>
@@ -118,4 +118,4 @@ int _compare(const uint8_t *a, const uint8_t *b, size_t size);
 }
 #endif
 
-#endif /* __TC_UTILS_H__ */
+#endif /* __BLE_MESH_TC_UTILS_H__ */