Revise the fix for conflict between ipmicmd.h and hwloc diff.h