diff --git a/ipmitool/include/ipmitool/bswap.h b/ipmitool/include/ipmitool/bswap.h
index 97d2722..5be39c1 100644
--- a/ipmitool/include/ipmitool/bswap.h
+++ b/ipmitool/include/ipmitool/bswap.h
@@ -41,6 +41,9 @@
 # include <config.h>
 #endif
 
+#undef BSWAP_16
+#undef BSWAP_32
+
 #if HAVE_BYTESWAP_H
 # include <byteswap.h>
 # define BSWAP_16(x) bswap_16(x)