diff --git a/src/liblzma/common/vli_decoder.c b/src/liblzma/common/vli_decoder.c
index 3254ccc3..7fa5f47e 100644
--- a/src/liblzma/common/vli_decoder.c
+++ b/src/liblzma/common/vli_decoder.c
@@ -38,7 +38,7 @@ lzma_vli_decode(lzma_vli *restrict vli, size_t *vli_pos,
 		// Validate the arguments.
 		if (*vli_pos >= LZMA_VLI_BYTES_MAX
 				|| (*vli >> (*vli_pos * 7)) != 0)
-			return LZMA_PROG_ERROR;;
+			return LZMA_PROG_ERROR;
 
 		if (*in_pos >= in_size)
 			return LZMA_BUF_ERROR;
diff --git a/src/liblzma/lzma/lzma_common.h b/src/liblzma/lzma/lzma_common.h
index c3c587f0..49d9516b 100644
--- a/src/liblzma/lzma/lzma_common.h
+++ b/src/liblzma/lzma/lzma_common.h
@@ -88,14 +88,14 @@ typedef enum {
 #define update_literal_normal(state) \
 	state = ((state) <= STATE_SHORTREP_LIT_LIT \
 			? STATE_LIT_LIT \
-			: (state) - 3);
+			: (state) - 3)
 
 /// Like update_literal(state) but when it is already known that
 /// is_literal_state(state) is false.
 #define update_literal_matched(state) \
 	state = ((state) <= STATE_LIT_SHORTREP \
 			? (state) - 3 \
-			: (state) - 6);
+			: (state) - 6)
 
 /// Indicate that the latest state was a match.
 #define update_match(state) \
diff --git a/src/liblzma/rangecoder/range_decoder.h b/src/liblzma/rangecoder/range_decoder.h
index a8aca907..77cfaf78 100644
--- a/src/liblzma/rangecoder/range_decoder.h
+++ b/src/liblzma/rangecoder/range_decoder.h
@@ -246,14 +246,14 @@ do { \
 #define rc_bit(prob, action0, action1) \
 	rc_bit_last(prob, \
 		symbol <<= 1; action0, \
-		symbol = (symbol << 1) + 1; action1);
+		symbol = (symbol << 1) + 1; action1)
 
 
 #define rc_bit_safe(prob, action0, action1, seq) \
 	rc_bit_last_safe(prob, \
 		symbol <<= 1; action0, \
 		symbol = (symbol << 1) + 1; action1, \
-		seq);
+		seq)
 
 // Unroll fixed-sized bittree decoding.
 //
@@ -327,7 +327,7 @@ do { \
 #define rc_bit_add_if_1(probs, dest, value_to_add_if_1) \
 	rc_bit(probs[symbol], \
 		, \
-		dest += value_to_add_if_1);
+		dest += value_to_add_if_1)
 
 
 // Matched literal