diff --git a/include/libpldm/base.h b/include/libpldm/base.h
index 7c8ef04..c61837f 100644
--- a/include/libpldm/base.h
+++ b/include/libpldm/base.h
@@ -6,13 +6,13 @@
 extern "C" {
 #endif
 
+#include <libpldm/pldm_types.h>
+
 #include <asm/byteorder.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 
-#include "pldm_types.h"
-
 typedef uint8_t pldm_tid_t;
 
 /** @brief PLDM Types
diff --git a/include/libpldm/bios_table.h b/include/libpldm/bios_table.h
index 32f7451..62428ec 100644
--- a/include/libpldm/bios_table.h
+++ b/include/libpldm/bios_table.h
@@ -6,7 +6,8 @@
 extern "C" {
 #endif
 
-#include "bios.h"
+#include <libpldm/bios.h>
+
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/include/libpldm/firmware_update.h b/include/libpldm/firmware_update.h
index 46cfcca..60732af 100644
--- a/include/libpldm/firmware_update.h
+++ b/include/libpldm/firmware_update.h
@@ -6,8 +6,9 @@
 extern "C" {
 #endif
 
-#include "base.h"
-#include "pldm_types.h"
+#include <libpldm/base.h>
+#include <libpldm/pldm_types.h>
+
 #include "stdbool.h"
 #include <stddef.h>
 #include <stdint.h>
diff --git a/include/libpldm/fru.h b/include/libpldm/fru.h
index 3a066aa..c66f151 100644
--- a/include/libpldm/fru.h
+++ b/include/libpldm/fru.h
@@ -6,13 +6,13 @@
 extern "C" {
 #endif
 
+#include <libpldm/base.h>
+#include <libpldm/utils.h>
+
 #include <asm/byteorder.h>
 #include <stddef.h>
 #include <stdint.h>
 
-#include "base.h"
-#include "utils.h"
-
 #define PLDM_GET_FRU_RECORD_TABLE_METADATA_REQ_BYTES  0
 #define PLDM_GET_FRU_RECORD_TABLE_METADATA_RESP_BYTES 19
 #define PLDM_GET_FRU_RECORD_TABLE_REQ_BYTES	      5
diff --git a/include/libpldm/instance-id.h b/include/libpldm/instance-id.h
index 36094b9..1db8593 100644
--- a/include/libpldm/instance-id.h
+++ b/include/libpldm/instance-id.h
@@ -6,7 +6,8 @@
 extern "C" {
 #endif
 
-#include "libpldm/base.h"
+#include <libpldm/base.h>
+
 #include <stdint.h>
 
 typedef uint8_t pldm_instance_id_t;
diff --git a/include/libpldm/platform.h b/include/libpldm/platform.h
index 251188b..8472107 100644
--- a/include/libpldm/platform.h
+++ b/include/libpldm/platform.h
@@ -9,9 +9,9 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "base.h"
-#include "pdr.h"
-#include "pldm_types.h"
+#include <libpldm/base.h>
+#include <libpldm/pdr.h>
+#include <libpldm/pldm_types.h>
 
 /* Maximum size for request */
 #define PLDM_SET_STATE_EFFECTER_STATES_REQ_BYTES  19
diff --git a/include/libpldm/states.h b/include/libpldm/states.h
index d1a8e37..640a141 100644
--- a/include/libpldm/states.h
+++ b/include/libpldm/states.h
@@ -6,7 +6,7 @@
 extern "C" {
 #endif
 
-#include "pldm_types.h"
+#include <libpldm/pldm_types.h>
 
 /** @brief PLDM enums for the boot progress state set
  */
diff --git a/include/libpldm/transport.h b/include/libpldm/transport.h
index 97c51d4..3a79cca 100644
--- a/include/libpldm/transport.h
+++ b/include/libpldm/transport.h
@@ -6,8 +6,9 @@
 extern "C" {
 #endif
 
-#include "libpldm/base.h"
-#include "libpldm/pldm.h"
+#include <libpldm/base.h>
+#include <libpldm/pldm.h>
+
 #include <stddef.h>
 
 struct pldm_transport;
diff --git a/include/libpldm/transport/af-mctp.h b/include/libpldm/transport/af-mctp.h
index e47b1aa..19f2860 100644
--- a/include/libpldm/transport/af-mctp.h
+++ b/include/libpldm/transport/af-mctp.h
@@ -2,8 +2,8 @@
 #ifndef LIBPLDM_AF_MCTP_H
 #define LIBPLDM_AF_MCTP_H
 
-#include "libpldm/base.h"
-#include "libpldm/pldm.h"
+#include <libpldm/base.h>
+#include <libpldm/pldm.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libpldm/transport/mctp-demux.h b/include/libpldm/transport/mctp-demux.h
index e912349..484e96c 100644
--- a/include/libpldm/transport/mctp-demux.h
+++ b/include/libpldm/transport/mctp-demux.h
@@ -2,8 +2,8 @@
 #ifndef LIBPLDM_DEMUX_H
 #define LIBPLDM_DEMUX_H
 
-#include "libpldm/base.h"
-#include "libpldm/pldm.h"
+#include <libpldm/base.h>
+#include <libpldm/pldm.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libpldm/utils.h b/include/libpldm/utils.h
index 8deec34..5966178 100644
--- a/include/libpldm/utils.h
+++ b/include/libpldm/utils.h
@@ -6,7 +6,8 @@
 extern "C" {
 #endif
 
-#include "pldm_types.h"
+#include <libpldm/pldm_types.h>
+
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>