diff --git a/storageaddsel.cpp b/storageaddsel.cpp
index 79064dd..2b9866f 100644
--- a/storageaddsel.cpp
+++ b/storageaddsel.cpp
@@ -1,6 +1,5 @@
 #include "error-HostEvent.hpp"
 #include "sensorhandler.hpp"
-#include "storagehandler.hpp"
 
 #include <systemd/sd-bus.h>
 
diff --git a/storagehandler.cpp b/storagehandler.cpp
index 5239ee9..dc7cf39 100644
--- a/storagehandler.cpp
+++ b/storagehandler.cpp
@@ -1,7 +1,5 @@
 #include "config.h"
 
-#include "storagehandler.hpp"
-
 #include "fruread.hpp"
 #include "read_fru_data.hpp"
 #include "selutility.hpp"
@@ -894,7 +892,7 @@
                           ipmiStorageGetSelTimeUtcOffset);
 
     // <Get SEL Entry>
-    ipmi_register_callback(NETFUN_STORAGE, IPMI_CMD_GET_SEL_ENTRY, NULL,
+    ipmi_register_callback(NETFUN_STORAGE, ipmi::storage::cmdGetSelEntry, NULL,
                            getSELEntry, PRIVILEGE_USER);
 
     // <Delete SEL Entry>
@@ -935,7 +933,7 @@
                           ipmi::Privilege::User, ipmiSensorReserveSdr);
 
     // <Get SDR>
-    ipmi_register_callback(NETFUN_STORAGE, IPMI_CMD_GET_SDR, nullptr,
+    ipmi_register_callback(NETFUN_STORAGE, ipmi::storage::cmdGetSdr, nullptr,
                            ipmi_sen_get_sdr, PRIVILEGE_USER);
 
 #endif
diff --git a/storagehandler.hpp b/storagehandler.hpp
deleted file mode 100644
index 6c91905..0000000
--- a/storagehandler.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-// IPMI commands for Storage net functions.
-enum ipmi_netfn_storage_cmds
-{
-    // Get capability bits
-    IPMI_CMD_GET_FRU_INV_AREA_INFO = 0x10,
-    IPMI_CMD_GET_REPOSITORY_INFO = 0x20,
-    IPMI_CMD_READ_FRU_DATA = 0x11,
-    IPMI_CMD_RESERVE_SDR = 0x22,
-    IPMI_CMD_GET_SDR = 0x23,
-    IPMI_CMD_GET_SEL_INFO = 0x40,
-    IPMI_CMD_RESERVE_SEL = 0x42,
-    IPMI_CMD_GET_SEL_ENTRY = 0x43,
-    IPMI_CMD_ADD_SEL = 0x44,
-    IPMI_CMD_DELETE_SEL = 0x46,
-    IPMI_CMD_CLEAR_SEL = 0x47,
-    IPMI_CMD_GET_SEL_TIME = 0x48,
-    IPMI_CMD_SET_SEL_TIME = 0x49,
-
-};