diff --git a/pldmtool/oem/ibm/oem_ibm_state_set.hpp b/pldmtool/oem/ibm/oem_ibm_state_set.hpp
index f6aea0c..361ae3c 100644
--- a/pldmtool/oem/ibm/oem_ibm_state_set.hpp
+++ b/pldmtool/oem/ibm/oem_ibm_state_set.hpp
@@ -1,6 +1,6 @@
 #include <libpldm/entity.h>
-#include <libpldm/entity_oem_ibm.h>
-#include <libpldm/state_set_oem_ibm.h>
+#include <libpldm/oem/ibm/entity.h>
+#include <libpldm/oem/ibm/state_set.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 db2b63a..b1da2a6 100644
--- a/pldmtool/oem/ibm/pldm_oem_ibm.cpp
+++ b/pldmtool/oem/ibm/pldm_oem_ibm.cpp
@@ -3,8 +3,8 @@
 #include "../../pldm_cmd_helper.hpp"
 
 #include <endian.h>
-#include <libpldm/file_io.h>
-#include <libpldm/host.h>
+#include <libpldm/oem/ibm/file_io.h>
+#include <libpldm/oem/ibm/host.h>
 #include <libpldm/pldm_types.h>
 
 #include <iostream>
diff --git a/pldmtool/pldm_base_cmd.cpp b/pldmtool/pldm_base_cmd.cpp
index 0b13ebe..87152cd 100644
--- a/pldmtool/pldm_base_cmd.cpp
+++ b/pldmtool/pldm_base_cmd.cpp
@@ -5,8 +5,8 @@
 #include <libpldm/utils.h>
 
 #ifdef OEM_IBM
-#include <libpldm/file_io.h>
-#include <libpldm/host.h>
+#include <libpldm/oem/ibm/file_io.h>
+#include <libpldm/oem/ibm/host.h>
 #endif
 
 #include <string>
diff --git a/pldmtool/pldm_fru_cmd.cpp b/pldmtool/pldm_fru_cmd.cpp
index 8c353c8..2e2ebf4 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/oem/ibm/fru.h>
 #endif
 
 #include <endian.h>