diff --git a/src/eap-pwd.c b/src/eap-pwd.c
index 8384e062..af373493 100644
--- a/src/eap-pwd.c
+++ b/src/eap-pwd.c
@@ -598,8 +598,8 @@ static void eap_pwd_send_ack(struct eap_state *eap)
 }
 
 #define FRAG_BYTES(mtu, remaining) \
-	((mtu - EAP_PWD_HDR_LEN) < remaining) ? (mtu - EAP_PWD_HDR_LEN) : \
-			remaining
+	(((mtu - EAP_PWD_HDR_LEN) < remaining) ? (mtu - EAP_PWD_HDR_LEN) : \
+			remaining)
 
 static void eap_pwd_handle_request(struct eap_state *eap,
 					const uint8_t *pkt, size_t len)
diff --git a/src/eapolutil.h b/src/eapolutil.h
index 9385248a..1f15872e 100644
--- a/src/eapolutil.h
+++ b/src/eapolutil.h
@@ -70,7 +70,7 @@ struct eapol_frame {
 #define EAPOL_KEY_DATA(ek, mic_len) ((ek)->key_data + (mic_len) + 2)
 
 /* gets frame length (not including key data) */
-#define EAPOL_FRAME_LEN(mic_len) sizeof(struct eapol_key) + (mic_len) + 2
+#define EAPOL_FRAME_LEN(mic_len) (sizeof(struct eapol_key) + (mic_len) + 2)
 
 struct eapol_key {
 	struct eapol_header header;
diff --git a/src/ie.h b/src/ie.h
index d460a7cc..302cda70 100644
--- a/src/ie.h
+++ b/src/ie.h
@@ -355,7 +355,7 @@ enum ie_rsn_akm_suite {
 	 (akm == IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384))
 
 #define IE_LEN(ie) \
-	(ie) ? (ie)[1] + 2 : 0
+	((ie) ? (ie)[1] + 2 : 0)
 
 struct ie_tlv_iter {
 	unsigned int max;
diff --git a/src/json.c b/src/json.c
index da445096..39b20ccb 100644
--- a/src/json.c
+++ b/src/json.c
@@ -35,7 +35,7 @@
 /* Max number of tokens supported. Increase if larger objects are expected */
 #define JSON_DEFAULT_TOKENS 60
 
-#define TOK_LEN(token) (token)->end - (token)->start
+#define TOK_LEN(token) ((token)->end - (token)->start)
 #define TOK_PTR(json, token) (void *)((json) + (token)->start)
 #define TOK_TO_STR(json, token) \
 ({ \