diff --git a/pldmtool/oem/ibm/oem_ibm_state_set.hpp b/pldmtool/oem/ibm/oem_ibm_state_set.hpp
index 7799c61..f6aea0c 100644
--- a/pldmtool/oem/ibm/oem_ibm_state_set.hpp
+++ b/pldmtool/oem/ibm/oem_ibm_state_set.hpp
@@ -1,7 +1,6 @@
-#include "libpldm/state_set_oem_ibm.h"
-
 #include <libpldm/entity.h>
 #include <libpldm/entity_oem_ibm.h>
+#include <libpldm/state_set_oem_ibm.h>
 
 /** @brief PLDM OEM IBM Code Update possible state set values
  */
diff --git a/pldmtool/oem/ibm/pldm_oem_ibm.cpp b/pldmtool/oem/ibm/pldm_oem_ibm.cpp
index 86081f4..a5eb71a 100644
--- a/pldmtool/oem/ibm/pldm_oem_ibm.cpp
+++ b/pldmtool/oem/ibm/pldm_oem_ibm.cpp
@@ -1,12 +1,11 @@
 #include "pldm_oem_ibm.hpp"
 
-#include "libpldm/file_io.h"
-#include "libpldm/host.h"
-#include "libpldm/pldm_types.h"
-
 #include "../../pldm_cmd_helper.hpp"
 
 #include <endian.h>
+#include <libpldm/file_io.h>
+#include <libpldm/host.h>
+#include <libpldm/pldm_types.h>
 
 #include <iostream>
 #include <string>
diff --git a/pldmtool/pldm_base_cmd.cpp b/pldmtool/pldm_base_cmd.cpp
index a8df376..cbc4d43 100644
--- a/pldmtool/pldm_base_cmd.cpp
+++ b/pldmtool/pldm_base_cmd.cpp
@@ -1,12 +1,12 @@
 #include "pldm_base_cmd.hpp"
 
-#include "libpldm/utils.h"
-
 #include "pldm_cmd_helper.hpp"
 
+#include <libpldm/utils.h>
+
 #ifdef OEM_IBM
-#include "libpldm/file_io.h"
-#include "libpldm/host.h"
+#include <libpldm/file_io.h>
+#include <libpldm/host.h>
 #endif
 
 #include <string>
diff --git a/pldmtool/pldm_bios_cmd.cpp b/pldmtool/pldm_bios_cmd.cpp
index 687be1f..bea7690 100644
--- a/pldmtool/pldm_bios_cmd.cpp
+++ b/pldmtool/pldm_bios_cmd.cpp
@@ -1,12 +1,12 @@
 #include "pldm_bios_cmd.hpp"
 
-#include "libpldm/bios_table.h"
-#include "libpldm/utils.h"
-
 #include "common/bios_utils.hpp"
 #include "common/utils.hpp"
 #include "pldm_cmd_helper.hpp"
 
+#include <libpldm/bios_table.h>
+#include <libpldm/utils.h>
+
 #include <map>
 #include <optional>
 
diff --git a/pldmtool/pldm_cmd_helper.cpp b/pldmtool/pldm_cmd_helper.cpp
index 039e984..1bee118 100644
--- a/pldmtool/pldm_cmd_helper.cpp
+++ b/pldmtool/pldm_cmd_helper.cpp
@@ -1,9 +1,8 @@
 #include "pldm_cmd_helper.hpp"
 
-#include "libpldm/pldm.h"
-
 #include "xyz/openbmc_project/Common/error.hpp"
 
+#include <libpldm/pldm.h>
 #include <systemd/sd-bus.h>
 
 #include <sdbusplus/server.hpp>
diff --git a/pldmtool/pldm_cmd_helper.hpp b/pldmtool/pldm_cmd_helper.hpp
index e3bb900..ef33bcb 100644
--- a/pldmtool/pldm_cmd_helper.hpp
+++ b/pldmtool/pldm_cmd_helper.hpp
@@ -1,13 +1,12 @@
 #pragma once
 
-#include "libpldm/base.h"
-#include "libpldm/bios.h"
-#include "libpldm/fru.h"
-#include "libpldm/platform.h"
-
 #include "common/utils.hpp"
 
 #include <err.h>
+#include <libpldm/base.h>
+#include <libpldm/bios.h>
+#include <libpldm/fru.h>
+#include <libpldm/platform.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
diff --git a/pldmtool/pldm_fru_cmd.cpp b/pldmtool/pldm_fru_cmd.cpp
index 6882916..14025aa 100644
--- a/pldmtool/pldm_fru_cmd.cpp
+++ b/pldmtool/pldm_fru_cmd.cpp
@@ -3,7 +3,7 @@
 #include "pldm_cmd_helper.hpp"
 
 #ifdef OEM_IBM
-#include "libpldm/fru_oem_ibm.h"
+#include <libpldm/fru_oem_ibm.h>
 #endif
 
 #include <endian.h>
diff --git a/pldmtool/pldm_fw_update_cmd.cpp b/pldmtool/pldm_fw_update_cmd.cpp
index b48a7f6..30491ef 100644
--- a/pldmtool/pldm_fw_update_cmd.cpp
+++ b/pldmtool/pldm_fw_update_cmd.cpp
@@ -1,10 +1,10 @@
 #include "pldm_fw_update_cmd.hpp"
 
-#include "libpldm/firmware_update.h"
-
 #include "common/utils.hpp"
 #include "pldm_cmd_helper.hpp"
 
+#include <libpldm/firmware_update.h>
+
 namespace pldmtool
 {
 
diff --git a/pldmtool/pldm_platform_cmd.cpp b/pldmtool/pldm_platform_cmd.cpp
index 694f333..33b0e0a 100644
--- a/pldmtool/pldm_platform_cmd.cpp
+++ b/pldmtool/pldm_platform_cmd.cpp
@@ -1,9 +1,9 @@
-#include "libpldm/entity.h"
-#include "libpldm/state_set.h"
-
 #include "common/types.hpp"
 #include "pldm_cmd_helper.hpp"
 
+#include <libpldm/entity.h>
+#include <libpldm/state_set.h>
+
 #include <cstddef>
 #include <map>