diff --git a/lib/crypto/tinycrypt/include/aes.h b/lib/crypto/tinycrypt/include/tinycrypt/aes.h
similarity index 100%
rename from lib/crypto/tinycrypt/include/aes.h
rename to lib/crypto/tinycrypt/include/tinycrypt/aes.h
diff --git a/lib/crypto/tinycrypt/include/cbc_mode.h b/lib/crypto/tinycrypt/include/tinycrypt/cbc_mode.h
similarity index 99%
rename from lib/crypto/tinycrypt/include/cbc_mode.h
rename to lib/crypto/tinycrypt/include/tinycrypt/cbc_mode.h
index fe9b2217af6..9f68a0093f5 100644
--- a/lib/crypto/tinycrypt/include/cbc_mode.h
+++ b/lib/crypto/tinycrypt/include/tinycrypt/cbc_mode.h
@@ -74,7 +74,7 @@
 #ifndef __TC_CBC_MODE_H__
 #define __TC_CBC_MODE_H__
 
-#include <aes.h>
+#include <tinycrypt/aes.h>
 
 /**
  *  @brief CBC encryption procedure
diff --git a/lib/crypto/tinycrypt/include/ctr_mode.h b/lib/crypto/tinycrypt/include/tinycrypt/ctr_mode.h
similarity index 99%
rename from lib/crypto/tinycrypt/include/ctr_mode.h
rename to lib/crypto/tinycrypt/include/tinycrypt/ctr_mode.h
index 845441c4fd0..71c1900c4a8 100644
--- a/lib/crypto/tinycrypt/include/ctr_mode.h
+++ b/lib/crypto/tinycrypt/include/tinycrypt/ctr_mode.h
@@ -67,7 +67,7 @@
 #ifndef __TC_CTR_MODE_H__
 #define __TC_CTR_MODE_H__
 
-#include <aes.h>
+#include <tinycrypt/aes.h>
 
 /**
  *  @brief CTR mode encryption/decryption procedure.
diff --git a/lib/crypto/tinycrypt/include/hmac.h b/lib/crypto/tinycrypt/include/tinycrypt/hmac.h
similarity index 99%
rename from lib/crypto/tinycrypt/include/hmac.h
rename to lib/crypto/tinycrypt/include/tinycrypt/hmac.h
index d4812218fc9..9f15f3e3988 100644
--- a/lib/crypto/tinycrypt/include/hmac.h
+++ b/lib/crypto/tinycrypt/include/tinycrypt/hmac.h
@@ -63,7 +63,7 @@
 #ifndef __TC_HMAC_H__
 #define __TC_HMAC_H__
 
-#include <sha256.h>
+#include <tinycrypt/sha256.h>
 
 struct tc_hmac_state_struct {
 	/* the internal state required by h */
diff --git a/lib/crypto/tinycrypt/include/hmac_prng.h b/lib/crypto/tinycrypt/include/tinycrypt/hmac_prng.h
similarity index 99%
rename from lib/crypto/tinycrypt/include/hmac_prng.h
rename to lib/crypto/tinycrypt/include/tinycrypt/hmac_prng.h
index 283a8f14e53..37b67ae8d0c 100644
--- a/lib/crypto/tinycrypt/include/hmac_prng.h
+++ b/lib/crypto/tinycrypt/include/tinycrypt/hmac_prng.h
@@ -68,8 +68,8 @@
 #ifndef __TC_HMAC_PRNG_H__
 #define __TC_HMAC_PRNG_H__
 
-#include <sha256.h>
-#include <hmac.h>
+#include <tinycrypt/sha256.h>
+#include <tinycrypt/hmac.h>
 
 struct tc_hmac_prng_struct {
 	/* the HMAC instance for this PRNG */
diff --git a/lib/crypto/tinycrypt/include/sha256.h b/lib/crypto/tinycrypt/include/tinycrypt/sha256.h
similarity index 100%
rename from lib/crypto/tinycrypt/include/sha256.h
rename to lib/crypto/tinycrypt/include/tinycrypt/sha256.h
diff --git a/lib/crypto/tinycrypt/include/utils.h b/lib/crypto/tinycrypt/include/tinycrypt/utils.h
similarity index 100%
rename from lib/crypto/tinycrypt/include/utils.h
rename to lib/crypto/tinycrypt/include/tinycrypt/utils.h
diff --git a/lib/crypto/tinycrypt/source/aes_decrypt.c b/lib/crypto/tinycrypt/source/aes_decrypt.c
index e326cfd4e8f..51f7bd2b7db 100644
--- a/lib/crypto/tinycrypt/source/aes_decrypt.c
+++ b/lib/crypto/tinycrypt/source/aes_decrypt.c
@@ -30,8 +30,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <aes.h>
-#include <utils.h>
+#include <tinycrypt/aes.h>
+#include <tinycrypt/utils.h>
 
 #define ZERO_BYTE 0x00
 
diff --git a/lib/crypto/tinycrypt/source/aes_encrypt.c b/lib/crypto/tinycrypt/source/aes_encrypt.c
index 720a7a134a2..1d48f82333b 100644
--- a/lib/crypto/tinycrypt/source/aes_encrypt.c
+++ b/lib/crypto/tinycrypt/source/aes_encrypt.c
@@ -30,8 +30,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <aes.h>
-#include <utils.h>
+#include <tinycrypt/aes.h>
+#include <tinycrypt/utils.h>
 
 static const uint8_t sbox[256] = {
         0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b,
diff --git a/lib/crypto/tinycrypt/source/cbc_mode.c b/lib/crypto/tinycrypt/source/cbc_mode.c
index 379371e9fed..aee03200970 100644
--- a/lib/crypto/tinycrypt/source/cbc_mode.c
+++ b/lib/crypto/tinycrypt/source/cbc_mode.c
@@ -30,8 +30,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <cbc_mode.h>
-#include <utils.h>
+#include <tinycrypt/cbc_mode.h>
+#include <tinycrypt/utils.h>
 
 int32_t tc_cbc_mode_encrypt(uint8_t *out, uint32_t outlen, const uint8_t *in,
                             uint32_t inlen, const uint8_t *iv,
diff --git a/lib/crypto/tinycrypt/source/ctr_mode.c b/lib/crypto/tinycrypt/source/ctr_mode.c
index c405cf97f62..559760f1454 100644
--- a/lib/crypto/tinycrypt/source/ctr_mode.c
+++ b/lib/crypto/tinycrypt/source/ctr_mode.c
@@ -30,8 +30,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <ctr_mode.h>
-#include <utils.h>
+#include <tinycrypt/ctr_mode.h>
+#include <tinycrypt/utils.h>
 
 int32_t tc_ctr_mode(uint8_t *out, uint32_t outlen, const uint8_t *in,
 		    uint32_t inlen, uint8_t *ctr, const TCAesKeySched_t sched)
diff --git a/lib/crypto/tinycrypt/source/hmac.c b/lib/crypto/tinycrypt/source/hmac.c
index ffb02cbcf23..be80915b7c4 100644
--- a/lib/crypto/tinycrypt/source/hmac.c
+++ b/lib/crypto/tinycrypt/source/hmac.c
@@ -30,8 +30,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hmac.h>
-#include <utils.h>
+#include <tinycrypt/hmac.h>
+#include <tinycrypt/utils.h>
 
 static void rekey(uint8_t *key, const uint8_t *new_key, uint32_t key_size)
 {
diff --git a/lib/crypto/tinycrypt/source/hmac_prng.c b/lib/crypto/tinycrypt/source/hmac_prng.c
index 8548f0286de..9ad85c6a93e 100644
--- a/lib/crypto/tinycrypt/source/hmac_prng.c
+++ b/lib/crypto/tinycrypt/source/hmac_prng.c
@@ -30,9 +30,9 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <hmac_prng.h>
-#include <hmac.h>
-#include <utils.h>
+#include <tinycrypt/hmac_prng.h>
+#include <tinycrypt/hmac.h>
+#include <tinycrypt/utils.h>
 
 /* min bytes in the seed string.
  * MIN_SLEN*8 must be at least the expected security level. */
diff --git a/lib/crypto/tinycrypt/source/sha256.c b/lib/crypto/tinycrypt/source/sha256.c
index 526632b2c97..32401965ff4 100644
--- a/lib/crypto/tinycrypt/source/sha256.c
+++ b/lib/crypto/tinycrypt/source/sha256.c
@@ -30,8 +30,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sha256.h>
-#include <utils.h>
+#include <tinycrypt/sha256.h>
+#include <tinycrypt/utils.h>
 
 static void compress(uint32_t *iv, const uint8_t *data);
 
diff --git a/lib/crypto/tinycrypt/source/utils.c b/lib/crypto/tinycrypt/source/utils.c
index 366b8f82d52..3a31704581d 100644
--- a/lib/crypto/tinycrypt/source/utils.c
+++ b/lib/crypto/tinycrypt/source/utils.c
@@ -30,7 +30,7 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <utils.h>
+#include <tinycrypt/utils.h>
 
 #include <string.h>
 
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 2d359035235..2b5af751f5f 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -47,8 +47,8 @@
 #include <bluetooth/bluetooth.h>
 
 #if defined(CONFIG_TINYCRYPT_AES)
-#include <aes.h>
-#include <utils.h>
+#include <tinycrypt/aes.h>
+#include <tinycrypt/utils.h>
 #endif
 
 #include "hci_core.h"
diff --git a/samples/crypto/test_aes/test_aes.c b/samples/crypto/test_aes/test_aes.c
index bf04021563b..5e2cf92b2ec 100644
--- a/samples/crypto/test_aes/test_aes.c
+++ b/samples/crypto/test_aes/test_aes.c
@@ -42,7 +42,7 @@
 */
 
 #include <test_utils.h>
-#include <aes.h>
+#include <tinycrypt/aes.h>
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/samples/crypto/test_cbc/test_cbc_mode.c b/samples/crypto/test_cbc/test_cbc_mode.c
index 7be47f8936a..2c582ce056c 100644
--- a/samples/crypto/test_cbc/test_cbc_mode.c
+++ b/samples/crypto/test_cbc/test_cbc_mode.c
@@ -37,7 +37,7 @@
   - AES128 CBC mode encryption SP 800-38a tests
 */
 
-#include <cbc_mode.h>
+#include <tinycrypt/cbc_mode.h>
 #include "test_utils.h"
 
 #include <stdlib.h>
diff --git a/samples/crypto/test_ctr/test_ctr_mode.c b/samples/crypto/test_ctr/test_ctr_mode.c
index 9296f6e3b31..3879e3e45d3 100644
--- a/samples/crypto/test_ctr/test_ctr_mode.c
+++ b/samples/crypto/test_ctr/test_ctr_mode.c
@@ -38,7 +38,7 @@
   - AES128 CTR mode encryption SP 800-38a tests
 */
 
-#include <ctr_mode.h>
+#include <tinycrypt/ctr_mode.h>
 #include <test_utils.h>
 
 #include <stdio.h>
diff --git a/samples/crypto/test_hmac/test_hmac.c b/samples/crypto/test_hmac/test_hmac.c
index 87cf245347f..36821b7494d 100644
--- a/samples/crypto/test_hmac/test_hmac.c
+++ b/samples/crypto/test_hmac/test_hmac.c
@@ -39,7 +39,7 @@
 */
 
 #include <test_utils.h>
-#include <hmac.h>
+#include <tinycrypt/hmac.h>
 
 uint32_t do_hmac_test(TCHmacState_t h, uint32_t testnum, const uint8_t *data,
 		      size_t datalen, const uint8_t *expected,
diff --git a/samples/crypto/test_prng/test_hmac_prng.c b/samples/crypto/test_prng/test_hmac_prng.c
index a5fd36f35cc..ea39a05c761 100644
--- a/samples/crypto/test_prng/test_hmac_prng.c
+++ b/samples/crypto/test_prng/test_hmac_prng.c
@@ -44,7 +44,7 @@
 #include <drivers/system_timer.h>
 #include <stdio.h>
 
-#include <hmac_prng.h>
+#include <tinycrypt/hmac_prng.h>
 
 /*
  * Main task to test AES
diff --git a/samples/crypto/test_sha256/test_sha256.c b/samples/crypto/test_sha256/test_sha256.c
index c2fc3226fa3..81b6cd1418d 100644
--- a/samples/crypto/test_sha256/test_sha256.c
+++ b/samples/crypto/test_sha256/test_sha256.c
@@ -38,7 +38,7 @@
   - NIST SHA256 test vectors
 */
 
-#include <sha256.h>
+#include <tinycrypt/sha256.h>
 #include <test_utils.h>
 
 #include <stdio.h>