diff --git a/payloads/libpayload/include/cbfs.h b/payloads/libpayload/include/cbfs.h
index c5c811cd3d..1b5c51a669 100644
--- a/payloads/libpayload/include/cbfs.h
+++ b/payloads/libpayload/include/cbfs.h
@@ -81,9 +81,6 @@ void *cbfs_simple_buffer_unmap(struct cbfs_simple_buffer *buffer,
 // Utility functions
 int run_address(void *f);
 
-/* Defined in src/lib/selfboot.c */
-void selfboot(void *entry);
-
 /* Defined in individual arch / board implementation. */
 int init_default_cbfs_media(struct cbfs_media *media);
 
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 1d4d0da10c..9781c9eab5 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -60,9 +60,6 @@
 #ifdef CONFIG_LP_LAR
 #include <lar.h>
 #endif
-#ifdef CONFIG_LP_CBFS
-#include <cbfs.h>
-#endif
 
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
@@ -445,4 +442,7 @@ char *readline(const char *prompt);
 int getline(char *buffer, int len);
 /** @} */
 
+/* Defined in arch/${ARCH}/selfboot.c */
+void selfboot(void *entry);
+
 #endif