diff --git a/src/base.c b/src/base.c
index 86bacea..5e652cc 100644
--- a/src/base.c
+++ b/src/base.c
@@ -1,7 +1,8 @@
-#include <endian.h>
-#include <string.h>
-
 #include "base.h"
+#include "pldm_types.h"
+#include <endian.h>
+#include <stdint.h>
+#include <string.h>
 
 uint8_t pack_pldm_header(const struct pldm_header_info *hdr,
 			 struct pldm_msg_hdr *msg)
diff --git a/src/bios.c b/src/bios.c
index 8d93a6a..d9c4c3e 100644
--- a/src/bios.c
+++ b/src/bios.c
@@ -1,7 +1,7 @@
 #include "bios.h"
+#include "base.h"
 #include "utils.h"
 #include <endian.h>
-#include <stdbool.h>
 #include <string.h>
 
 int encode_get_date_time_req(uint8_t instance_id, struct pldm_msg *msg)
diff --git a/src/bios_table.c b/src/bios_table.c
index ea9f669..d7735e1 100644
--- a/src/bios_table.c
+++ b/src/bios_table.c
@@ -1,3 +1,7 @@
+#include "bios_table.h"
+#include "base.h"
+#include "bios.h"
+#include "utils.h"
 #include <assert.h>
 #include <endian.h>
 #include <stdbool.h>
@@ -5,9 +9,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "bios.h"
-#include "bios_table.h"
-
 #define POINTER_CHECK(pointer)                                                 \
 	do {                                                                   \
 		if (pointer == NULL)                                           \
diff --git a/src/firmware_update.c b/src/firmware_update.c
index 59d1f9d..bd6ed9a 100644
--- a/src/firmware_update.c
+++ b/src/firmware_update.c
@@ -1,5 +1,7 @@
 #include "firmware_update.h"
+#include "utils.h"
 #include <endian.h>
+#include <stdbool.h>
 #include <string.h>
 
 /** @brief Check whether string type value is valid
diff --git a/src/fru.c b/src/fru.c
index fa79f2b..be9d411 100644
--- a/src/fru.c
+++ b/src/fru.c
@@ -1,9 +1,12 @@
 #include <assert.h>
 #include <endian.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <string.h>
 
+#include "base.h"
 #include "fru.h"
+#include "utils.h"
 
 int encode_get_fru_record_table_metadata_req(uint8_t instance_id,
 					     struct pldm_msg *msg,
diff --git a/src/oem/ibm/file_io.c b/src/oem/ibm/file_io.c
index b3464cb..79132a1 100644
--- a/src/oem/ibm/file_io.c
+++ b/src/oem/ibm/file_io.c
@@ -1,4 +1,5 @@
 #include "libpldm/file_io.h"
+#include "base.h"
 #include <endian.h>
 #include <string.h>
 
diff --git a/src/oem/ibm/host.c b/src/oem/ibm/host.c
index d557a41..5cdcf74 100644
--- a/src/oem/ibm/host.c
+++ b/src/oem/ibm/host.c
@@ -1,4 +1,6 @@
+#include "base.h"
 #include <endian.h>
+#include <stdint.h>
 #include <string.h>
 
 #include "libpldm/host.h"
diff --git a/src/pdr.c b/src/pdr.c
index b057e3d..fe28aa9 100644
--- a/src/pdr.c
+++ b/src/pdr.c
@@ -1,6 +1,7 @@
 #include "pdr.h"
 #include "platform.h"
 #include <assert.h>
+#include <endian.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/platform.c b/src/platform.c
index 492fe65..00dc019 100644
--- a/src/platform.c
+++ b/src/platform.c
@@ -1,4 +1,7 @@
+#include "base.h"
+#include "pldm_types.h"
 #include <endian.h>
+#include <stdint.h>
 #include <string.h>
 
 #include "platform.h"
diff --git a/src/requester/pldm.c b/src/requester/pldm.c
index 932f55e..34f0c30 100644
--- a/src/requester/pldm.c
+++ b/src/requester/pldm.c
@@ -1,10 +1,10 @@
 #include "pldm.h"
 #include "base.h"
 
-#include <errno.h>
+#include <bits/types/struct_iovec.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <sys/un.h>
 #include <unistd.h>