diff --git a/licence.c b/licence.c
index 248cb0e..bf73f0f 100644
--- a/licence.c
+++ b/licence.c
@@ -43,7 +43,7 @@ licence_generate_keys(uint8 * client_random, uint8 * server_random, uint8 * pre_
 
 	/* Generate master secret and then key material */
 	sec_hash_48(master_secret, pre_master_secret, client_random, server_random, 'A');
-	sec_hash_48(key_block,     master_secret,     server_random, client_random, 'A');
+	sec_hash_48(key_block, master_secret, server_random, client_random, 'A');
 
 	/* Store first 16 bytes of session key as MAC secret */
 	memcpy(g_licence_sign_key, key_block, 16);
diff --git a/secure.c b/secure.c
index 209ecb4..d354cfb 100644
--- a/secure.c
+++ b/secure.c
@@ -134,12 +134,12 @@ sec_generate_keys(uint8 * client_random, uint8 * server_random, int rc4_key_size
 	uint8 key_block[48];
 
 	/* Construct pre-master secret */
-	memcpy(pre_master_secret,      client_random, 24);
+	memcpy(pre_master_secret, client_random, 24);
 	memcpy(pre_master_secret + 24, server_random, 24);
 
 	/* Generate master secret and then key material */
 	sec_hash_48(master_secret, pre_master_secret, client_random, server_random, 'A');
-	sec_hash_48(key_block,     master_secret,     client_random, server_random, 'X');
+	sec_hash_48(key_block, master_secret, client_random, server_random, 'X');
 
 	/* First 16 bytes of key material is MAC secret */
 	memcpy(sec_sign_key, key_block, 16);
diff --git a/xkeymap.c b/xkeymap.c
index edc59a7..31acc0a 100644
--- a/xkeymap.c
+++ b/xkeymap.c
@@ -656,7 +656,8 @@ reset_modifier_keys()
 		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LALT);
 
 	if (MASK_HAS_BITS(remote_modifier_state, MapRightAltMask) &&
-	    !get_key_state(state, XK_Alt_R) && !get_key_state(state, XK_Mode_switch) && !get_key_state(state, XK_ISO_Level3_Shift))
+	    !get_key_state(state, XK_Alt_R) && !get_key_state(state, XK_Mode_switch)
+	    && !get_key_state(state, XK_ISO_Level3_Shift))
 		rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RALT);
 
 	reset_winkey(ev_time);
diff --git a/xwin.c b/xwin.c
index 5960e40..312efec 100644
--- a/xwin.c
+++ b/xwin.c
@@ -172,9 +172,9 @@ static PixelColour
 split_colour15(uint32 colour)
 {
 	PixelColour rv;
-	rv.red = ((colour >> 7 ) & 0xf8) | ((colour >> 12) & 0x7);
+	rv.red = ((colour >> 7) & 0xf8) | ((colour >> 12) & 0x7);
 	rv.green = ((colour >> 2) & 0xf8) | ((colour >> 8) & 0x7);
-	rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2)  & 0x7);
+	rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2) & 0x7);
 	return rv;
 }
 
@@ -182,9 +182,9 @@ static PixelColour
 split_colour16(uint32 colour)
 {
 	PixelColour rv;
-	rv.red = ((colour >> 8 ) & 0xf8) | ((colour >> 13) & 0x7);
+	rv.red = ((colour >> 8) & 0xf8) | ((colour >> 13) & 0x7);
 	rv.green = ((colour >> 3) & 0xfc) | ((colour >> 9) & 0x3);
-	rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2)  & 0x7);
+	rv.blue = ((colour << 3) & 0xf8) | ((colour >> 2) & 0x7);
 	return rv;
 }
 
@@ -252,8 +252,8 @@ translate8to16(uint8 * data, uint8 * out, uint8 * end)
 	uint16 value;
 
 	if (g_arch_match)
-		REPEAT(*((uint16 *) out) = g_colmap[*(data++)]; out += 2;
-		)
+		REPEAT(*((uint16 *) out) = g_colmap[*(data++)];
+		       out += 2;)
 	else
 if (g_xserver_be)
 {
@@ -309,8 +309,8 @@ translate8to32(uint8 * data, uint8 * out, uint8 * end)
 	uint32 value;
 
 	if (g_arch_match)
-		REPEAT(*((uint32 *) out) = g_colmap[*(data++)]; out += 4;
-		)
+		REPEAT(*((uint32 *) out) = g_colmap[*(data++)];
+		       out += 4;)
 	else
 if (g_xserver_be)
 {