diff --git a/arch/arm/src/sam34/sam_aes.c b/arch/arm/src/sam34/sam_aes.c
index 004ba43166..4f3818a228 100644
--- a/arch/arm/src/sam34/sam_aes.c
+++ b/arch/arm/src/sam34/sam_aes.c
@@ -47,9 +47,9 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <crypto/crypto.h>
-#include <arch/board/board.h>
+#include <nuttx/crypto/crypto.h>
 #include <nuttx/arch.h>
+#include <arch/board/board.h>
 
 #include "up_internal.h"
 #include "up_arch.h"
@@ -205,4 +205,4 @@ int up_aesinitialize()
   sam_aes_enableclk();
   putreg32(AES_CR_SWRST, SAM_AES_CR);
   return OK;
-}
\ No newline at end of file
+}
diff --git a/crypto/crypto.c b/crypto/crypto.c
index d85a3e1b11..b1978343b7 100644
--- a/crypto/crypto.c
+++ b/crypto/crypto.c
@@ -44,8 +44,9 @@
 #include <string.h>
 #include <poll.h>
 #include <errno.h>
+
 #include <nuttx/fs/fs.h>
-#include <crypto/crypto.h>
+#include <nuttx/crypto/crypto.h>
 
 /****************************************************************************
  * Private Function Prototypes
diff --git a/crypto/cryptodev.c b/crypto/cryptodev.c
index 827c80b327..e9b57aa693 100644
--- a/crypto/cryptodev.c
+++ b/crypto/cryptodev.c
@@ -47,8 +47,8 @@
 
 #include <nuttx/fs/fs.h>
 
-#include <crypto/crypto.h>
-#include <crypto/cryptodev.h>
+#include <crypto/nuttx/crypto.h>
+#include <crypto/nuttx/cryptodev.h>
 
 /****************************************************************************
  * Private Function Prototypes
diff --git a/crypto/testmngr.c b/crypto/testmngr.c
index 46ac00ac11..d307599d0e 100644
--- a/crypto/testmngr.c
+++ b/crypto/testmngr.c
@@ -44,12 +44,11 @@
 #include <string.h>
 #include <poll.h>
 #include <errno.h>
+#include <debug.h>
 
 #include <nuttx/fs/fs.h>
-
-#include <crypto/crypto.h>
 #include <nuttx/kmalloc.h>
-#include <debug.h>
+#include <nuttx/crypto/crypto.h>
 
 #ifdef CONFIG_CRYPTO_ALGTEST
 
diff --git a/include/crypto/crypto.h b/include/nuttx/crypto/crypto.h
similarity index 95%
rename from include/crypto/crypto.h
rename to include/nuttx/crypto/crypto.h
index a315f1a1e4..090fe77c26 100644
--- a/include/crypto/crypto.h
+++ b/include/nuttx/crypto/crypto.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/crypto/crypto.h
+ * include/nuttx/crypto/crypto.h
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author:  Max Nekludov <macscomp@gmail.com>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_CRYPTO_CRYPTO_H
-#define __INCLUDE_CRYPTO_CRYPTO_H
+#ifndef __INCLUDE_NUTTX_CRYPTO_CRYPTO_H
+#define __INCLUDE_NUTTX_CRYPTO_CRYPTO_H
 
 /****************************************************************************
  * Included Files
@@ -91,4 +91,4 @@ int aes_cypher(FAR void *out, FAR const void *in, uint32_t size, FAR const void
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __INCLUDE_CRYPTO_CRYPTO_H */
+#endif /* __INCLUDE_NUTTX_CRYPTO_CRYPTO_H */
diff --git a/include/crypto/cryptodev.h b/include/nuttx/crypto/cryptodev.h
similarity index 95%
rename from include/crypto/cryptodev.h
rename to include/nuttx/crypto/cryptodev.h
index 80d735a480..78a2c06202 100644
--- a/include/crypto/cryptodev.h
+++ b/include/nuttx/crypto/cryptodev.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/crypto/cryptodev.h
+ * include/nuttx/crypto/cryptodev.h
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author:  Max Nekludov <macscomp@gmail.com>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_CRYPTO_CRYPTODEV_H
-#define __INCLUDE_CRYPTO_CRYPTODEV_H
+#ifndef __INCLUDE_NUTTX_CRYPTO_CRYPTODEV_H
+#define __INCLUDE_NUTTX_CRYPTO_CRYPTODEV_H
 
 /****************************************************************************
  * Included Files
@@ -92,4 +92,4 @@ struct crypt_op
   caddr_t iv;
 };
 
-#endif /* __INCLUDE_CRYPTO_CRYPTODEV_H */
+#endif /* __INCLUDE_NUTTX_CRYPTO_CRYPTODEV_H */