diff --git a/libpldm/meson.build b/libpldm/meson.build
index 0d868f9..edd0727 100644
--- a/libpldm/meson.build
+++ b/libpldm/meson.build
@@ -30,7 +30,8 @@
   headers += [
     '../oem/ibm/libpldm/file_io.h',
     '../oem/ibm/libpldm/host.h',
-    '../oem/ibm/libpldm/platform_oem_ibm.h'
+    '../oem/ibm/libpldm/platform_oem_ibm.h',
+    '../oem/ibm/libpldm/state_set_oem_ibm.h'
   ]
   sources += [
     '../oem/ibm/libpldm/file_io.c',
diff --git a/oem/ibm/libpldm/state_set.h b/oem/ibm/libpldm/state_set_oem_ibm.h
similarity index 90%
rename from oem/ibm/libpldm/state_set.h
rename to oem/ibm/libpldm/state_set_oem_ibm.h
index 107c8e2..cf5cb41 100644
--- a/oem/ibm/libpldm/state_set.h
+++ b/oem/ibm/libpldm/state_set_oem_ibm.h
@@ -1,5 +1,5 @@
-#ifndef OEM_IBM_STATE_SETS_H
-#define OEM_IBM_STATE_SETS_H
+#ifndef STATE_SET_OEM_IBM_H
+#define STATE_SET_OEM_IBM_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,4 +48,4 @@
 }
 #endif
 
-#endif /* OEM_IBM_STATE_SETS_H */
\ No newline at end of file
+#endif /* STATE_SET_OEM_IBM_H */
\ No newline at end of file
diff --git a/oem/ibm/libpldmresponder/oem_ibm_handler.hpp b/oem/ibm/libpldmresponder/oem_ibm_handler.hpp
index 3f4e778..e097b3a 100644
--- a/oem/ibm/libpldmresponder/oem_ibm_handler.hpp
+++ b/oem/ibm/libpldmresponder/oem_ibm_handler.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "libpldm/entity.h"
 #include "libpldm/platform.h"
-#include "oem/ibm/libpldm/state_set.h"
+#include "oem/ibm/libpldm/state_set_oem_ibm.h"
 
 #include "inband_code_update.hpp"
 #include "libpldmresponder/oem_handler.hpp"