diff --git a/ipmitool/include/ipmitool/ipmi_delloem.h b/ipmitool/include/ipmitool/ipmi_delloem.h
index 0484711..a82587c 100644
--- a/ipmitool/include/ipmitool/ipmi_delloem.h
+++ b/ipmitool/include/ipmitool/ipmi_delloem.h
@@ -173,10 +173,6 @@ typedef struct _lcd_mode
 #define MAX_LOM 8
 
 
-#define APP_NETFN                   (uint8_t)(0x6)
-
-
-#define GET_SYSTEM_INFO_CMD         (uint8_t)(0x59)
 #define EMB_NIC_MAC_ADDRESS_11G     (uint8_t)(0xDA)
 #define EMB_NIC_MAC_ADDRESS_9G_10G  (uint8_t)(0xCB)
 
diff --git a/ipmitool/lib/ipmi_delloem.c b/ipmitool/lib/ipmi_delloem.c
index 158c3a7..3579af4 100644
--- a/ipmitool/lib/ipmi_delloem.c
+++ b/ipmitool/lib/ipmi_delloem.c
@@ -2153,9 +2153,9 @@ static int ipmi_macinfo_10g (struct ipmi_intf* intf, uint8_t NicNum)
 
     memset(&req, 0, sizeof(req));
 
-    req.msg.netfn = APP_NETFN;
+    req.msg.netfn = IPMI_NETFN_APP;
     req.msg.lun = 0;                
-    req.msg.cmd = GET_SYSTEM_INFO_CMD;
+    req.msg.cmd = IPMI_GET_SYS_INFO;
     req.msg.data = msg_data;
 
 
@@ -2261,9 +2261,9 @@ static int ipmi_macinfo_11g (struct ipmi_intf* intf, uint8_t NicNum)
 
     memset(&req, 0, sizeof(req));
 
-    req.msg.netfn = APP_NETFN;
+    req.msg.netfn = IPMI_NETFN_APP;
     req.msg.lun = 0;              
-    req.msg.cmd = GET_SYSTEM_INFO_CMD;
+    req.msg.cmd = IPMI_GET_SYS_INFO;
     req.msg.data = msg_data;
 
 
@@ -2301,9 +2301,9 @@ static int ipmi_macinfo_11g (struct ipmi_intf* intf, uint8_t NicNum)
             msg_data[input_length++] = offset;
             msg_data[input_length++] = len;   
 
-            req.msg.netfn = APP_NETFN;
+            req.msg.netfn = IPMI_NETFN_APP;
             req.msg.lun = 0;
-            req.msg.cmd = GET_SYSTEM_INFO_CMD;
+            req.msg.cmd = IPMI_GET_SYS_INFO;
             req.msg.data = msg_data;
             req.msg.data_len = input_length;