diff --git a/arch/arm/mach-tegra/tegra20/crypto.c b/arch/arm/mach-tegra/tegra20/crypto.c
index 1b82fbb591dceb909f2d64110582b45501c0c7b2..eae79217d443519b815c41c2f2dbb990a8cc0ab0 100644
--- a/arch/arm/mach-tegra/tegra20/crypto.c
+++ b/arch/arm/mach-tegra/tegra20/crypto.c
@@ -8,7 +8,7 @@
 #include <common.h>
 #include <linux/errno.h>
 #include "crypto.h"
-#include "aes.h"
+#include "uboot_aes.h"
 
 static u8 zero_key[16];
 
diff --git a/cmd/aes.c b/cmd/aes.c
index 76da3efffec8bd9337bf53d07cd9fabda2f7259a..ee1ae13c06ece13827475c42fb79aaeeed023133 100644
--- a/cmd/aes.c
+++ b/cmd/aes.c
@@ -9,7 +9,7 @@
 #include <common.h>
 #include <command.h>
 #include <environment.h>
-#include <aes.h>
+#include <uboot_aes.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
diff --git a/common/env_common.c b/common/env_common.c
index 7fb62e8b45753616053e7b3856936c0d99a0ad87..6845f8d8d542945f90b005f8fcef1e261092c9c8 100644
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -140,7 +140,7 @@ int set_default_vars(int nvars, char * const vars[])
 }
 
 #ifdef CONFIG_ENV_AES
-#include <aes.h>
+#include <uboot_aes.h>
 /**
  * env_aes_cbc_get_key() - Get AES-128-CBC key for the environment
  *
diff --git a/include/aes.h b/include/uboot_aes.h
similarity index 100%
rename from include/aes.h
rename to include/uboot_aes.h
diff --git a/lib/aes.c b/lib/aes.c
index 9d7a0a1c11850ac76eda5e66715bbc18f534d87b..d6144e61d6ef089a8138cc6f33a3560e6b44c2ba 100644
--- a/lib/aes.c
+++ b/lib/aes.c
@@ -27,7 +27,7 @@
 #else
 #include <string.h>
 #endif
-#include "aes.h"
+#include "uboot_aes.h"
 
 /* forward s-box */
 static const u8 sbox[256] = {
diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
index 05588ab6d55f838731204971a24633a05284d710..0d7130a381d1e77cdcf2771ff5ce2a6f8ffa8b64 100644
--- a/tools/env/fw_env.h
+++ b/tools/env/fw_env.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#include <aes.h>
+#include <uboot_aes.h>
 #include <stdint.h>
 
 /* Pull in the current config to define the default environment */