diff --git a/libpldm/entity.h b/libpldm/entity.h
index 600946e..3cf0a23 100644
--- a/libpldm/entity.h
+++ b/libpldm/entity.h
@@ -139,6 +139,10 @@
 
 	/* Logical */
 	PLDM_ENTITY_SYSTEM_LOGICAL = 11521,
+
+	/* OEM ranges */
+	PLDM_OEM_ENTITY_TYPE_START = 24576,
+	PLDM_OEM_ENTITY_TYPE_END = 32767,
 };
 
 #ifdef __cplusplus
diff --git a/libpldm/state_set.h b/libpldm/state_set.h
index 3a0528e..009b0df 100644
--- a/libpldm/state_set.h
+++ b/libpldm/state_set.h
@@ -162,6 +162,11 @@
 	PLDM_SW_TERM_GRACEFUL_SHUTDOWN = 7,
 	PLDM_SW_TERM_TERMINATION_REQUEST_FAILED = 8,
 };
+
+/* OEM ranges */
+#define PLDM_OEM_STATE_SET_ID_START 32768
+#define PLDM_OEM_STATE_SET_ID_END 65535
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/libpldm/states.h b/libpldm/states.h
index ca20acd..a89648d 100644
--- a/libpldm/states.h
+++ b/libpldm/states.h
@@ -7,13 +7,6 @@
 
 #include "pldm_types.h"
 
-/** @brief PLDM state set ids
- */
-enum pldm_state_set_ids {
-	PLDM_BOOT_PROGRESS_STATE = 196,
-	PLDM_SYSTEM_POWER_STATE = 260,
-};
-
 /** @brief PLDM enums for the boot progress state set
  */
 enum pldm_boot_progress_states {