diff --git a/include/libpldm/base.h b/include/libpldm/base.h
index 6c2e094..26e0825 100644
--- a/include/libpldm/base.h
+++ b/include/libpldm/base.h
@@ -134,10 +134,10 @@
 } __attribute__((packed));
 
 // Macros for byte-swapping variables in-place
-#define HTOLE32(X) (X = htole32(X))
-#define HTOLE16(X) (X = htole16(X))
-#define LE32TOH(X) (X = le32toh(X))
-#define LE16TOH(X) (X = le16toh(X))
+#define HTOLE32(X) ((X) = htole32(X))
+#define HTOLE16(X) ((X) = htole16(X))
+#define LE32TOH(X) ((X) = le32toh(X))
+#define LE16TOH(X) ((X) = le16toh(X))
 
 /** @struct pldm_msg
  *