diff --git a/src/soc/amd/cezanne/uart.c b/src/soc/amd/cezanne/uart.c
index 3ac7deb755..189a1e5a87 100644
--- a/src/soc/amd/cezanne/uart.c
+++ b/src/soc/amd/cezanne/uart.c
@@ -3,8 +3,6 @@
 #include <amdblocks/gpio.h>
 #include <amdblocks/uart.h>
 #include <commonlib/helpers.h>
-#include <console/console.h>
-#include <device/device.h>
 #include <device/mmio.h>
 #include <soc/aoac_defs.h>
 #include <soc/gpio.h>
diff --git a/src/soc/amd/mendocino/uart.c b/src/soc/amd/mendocino/uart.c
index d4bf2feae9..03fc593624 100644
--- a/src/soc/amd/mendocino/uart.c
+++ b/src/soc/amd/mendocino/uart.c
@@ -3,8 +3,6 @@
 #include <amdblocks/gpio.h>
 #include <amdblocks/uart.h>
 #include <commonlib/helpers.h>
-#include <console/console.h>
-#include <device/device.h>
 #include <device/mmio.h>
 #include <soc/aoac_defs.h>
 #include <soc/gpio.h>
diff --git a/src/soc/amd/morgana/uart.c b/src/soc/amd/morgana/uart.c
index 401a134cf5..92cb2fe121 100644
--- a/src/soc/amd/morgana/uart.c
+++ b/src/soc/amd/morgana/uart.c
@@ -5,8 +5,6 @@
 #include <amdblocks/gpio.h>
 #include <amdblocks/uart.h>
 #include <commonlib/helpers.h>
-#include <console/console.h>
-#include <device/device.h>
 #include <device/mmio.h>
 #include <soc/aoac_defs.h>
 #include <soc/gpio.h>
diff --git a/src/soc/amd/picasso/uart.c b/src/soc/amd/picasso/uart.c
index e3e3aa9792..2120ad71b9 100644
--- a/src/soc/amd/picasso/uart.c
+++ b/src/soc/amd/picasso/uart.c
@@ -1,11 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <console/console.h>
-#include <commonlib/helpers.h>
-#include <device/device.h>
 #include <device/mmio.h>
 #include <amdblocks/gpio.h>
 #include <amdblocks/uart.h>
+#include <commonlib/helpers.h>
 #include <soc/aoac_defs.h>
 #include <soc/gpio.h>
 #include <soc/iomap.h>
diff --git a/src/soc/amd/stoneyridge/uart.c b/src/soc/amd/stoneyridge/uart.c
index 86e2626a50..7fbba07a78 100644
--- a/src/soc/amd/stoneyridge/uart.c
+++ b/src/soc/amd/stoneyridge/uart.c
@@ -2,6 +2,7 @@
 
 #include <amdblocks/gpio.h>
 #include <amdblocks/uart.h>
+#include <commonlib/helpers.h>
 #include <soc/aoac_defs.h>
 #include <soc/gpio.h>
 #include <soc/iomap.h>