diff --git a/src/audio/base_fw.c b/src/audio/base_fw.c
index 0e6fc8ae14e6..07d396c70bf5 100644
--- a/src/audio/base_fw.c
+++ b/src/audio/base_fw.c
@@ -445,7 +445,7 @@ static int basefw_libraries_info_get(uint32_t *data_offset, char *data)
 		if (lib_id == 0)
 			desc = (struct sof_man_fw_desc *)IMR_BOOT_LDR_MANIFEST_BASE;
 		else
-			desc = lib_manager_get_library_module_desc(lib_id);
+			desc = (struct sof_man_fw_desc *)lib_manager_get_library_manifest(lib_id);
 #else
 		return -EINVAL;
 #endif
diff --git a/src/include/ipc4/base_fw.h b/src/include/ipc4/base_fw.h
index 63177b1ae9c2..711a26446f21 100644
--- a/src/include/ipc4/base_fw.h
+++ b/src/include/ipc4/base_fw.h
@@ -17,8 +17,6 @@
 #ifndef __SOF_IPC4_BASE_FW_H__
 #define __SOF_IPC4_BASE_FW_H__
 
-#include <rimage/sof/user/manifest.h>
-
 /* Three clk src states :low power XTAL,  low power ring
  * and high power ring oscillator
  */
@@ -644,7 +642,7 @@ struct ipc4_library_props {
     /* Base FW is always reported with id 0. */
 	uint32_t id;
 	/* Name of the library. */
-	uint8_t name[SOF_MAN_FW_HDR_FW_NAME_LEN];
+	uint8_t name[8];
 	/* Major version of the library. */
 	uint16_t major_version;
 	/* Minor version of the library. */
@@ -655,14 +653,14 @@ struct ipc4_library_props {
 	uint16_t build_version;
 	/* Number of modules packed into the library. */
 	uint32_t num_module_entries;
-} __attribute__((packed, aligned(4)));
+} __packed __aligned(4);
 
 struct ipc4_libraries_info {
 	/* Specifies number of items in libraries array. */
 	uint32_t library_count;
 	/* Array of libraries properties. */
 	struct ipc4_library_props libraries[1];
-} __attribute__((packed, aligned(4)));
+} __packed __aligned(4);
 
 struct ipc4_log_state_info {
 	/*