5 files changed, 5 insertions, 8 deletions
diff --git a/src/arch/arm64/fit_payload.c b/src/arch/arm64/fit_payload.c
index 002df44fcc..7009a3f25d 100644
--- a/src/arch/arm64/fit_payload.c
+++ b/src/arch/arm64/fit_payload.c
@@ -12,13 +12,12 @@
  * GNU General Public License for more details.
  */
 
+#include <cbfs.h>
+#include <commonlib/bsd/compression.h>
 #include <console/console.h>
 #include <bootmem.h>
 #include <program_loading.h>
 #include <string.h>
-#include <commonlib/compression.h>
-#include <commonlib/cbfs_serialized.h>
-#include <commonlib/helpers.h>
 #include <lib.h>
 #include <fit.h>
 #include <endian.h>
diff --git a/src/arch/riscv/boot.c b/src/arch/riscv/boot.c
index aaaac485ea..f9f94a7086 100644
--- a/src/arch/riscv/boot.c
+++ b/src/arch/riscv/boot.c
@@ -19,7 +19,7 @@
 #include <arch/encoding.h>
 #include <arch/smp/smp.h>
 #include <mcall.h>
-#include <commonlib/cbfs_serialized.h>
+#include <cbfs.h>
 #include <console/console.h>
 
 struct arch_prog_run_args {
diff --git a/src/arch/riscv/fit_payload.c b/src/arch/riscv/fit_payload.c
index 89263d3fad..63cda846fc 100644
--- a/src/arch/riscv/fit_payload.c
+++ b/src/arch/riscv/fit_payload.c
@@ -14,11 +14,11 @@
  * GNU General Public License for more details.
  */
 
+#include <cbfs.h>
+#include <commonlib/bsd/compression.h>
 #include <console/console.h>
 #include <bootmem.h>
 #include <program_loading.h>
-#include <commonlib/compression.h>
-#include <commonlib/cbfs_serialized.h>
 #include <lib.h>
 #include <fit.h>
 #include <endian.h>
diff --git a/src/arch/riscv/sbi.c b/src/arch/riscv/sbi.c
index e0d7c60e5f..27701895dd 100644
--- a/src/arch/riscv/sbi.c
+++ b/src/arch/riscv/sbi.c
@@ -15,7 +15,6 @@
 
 #include <mcall.h>
 #include <stdint.h>
-#include <commonlib/compiler.h>
 #include <arch/exception.h>
 #include <sbi.h>
 #include <vm.h>
diff --git a/src/arch/riscv/smp.c b/src/arch/riscv/smp.c
index b32e4b8694..95d116a629 100644
--- a/src/arch/riscv/smp.c
+++ b/src/arch/riscv/smp.c
@@ -18,7 +18,6 @@
 #include <arch/smp/smp.h>
 #include <arch/smp/spinlock.h>
 #include <mcall.h>
-#include <commonlib/compiler.h>
 #include <console/console.h>
 
 void smp_pause(int working_hartid)