diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c
index e18f0a1e0..1f56c4ed0 100644
--- a/client/X11/xf_event.c
+++ b/client/X11/xf_event.c
@@ -153,7 +153,7 @@ static const char* x11_event_string(int event)
 
 		default:
 			return "UNKNOWN";
-	};
+	}
 }
 
 #ifdef WITH_DEBUG_X11
diff --git a/client/X11/xfreerdp.h b/client/X11/xfreerdp.h
index b4488489a..b086562ba 100644
--- a/client/X11/xfreerdp.h
+++ b/client/X11/xfreerdp.h
@@ -322,8 +322,8 @@ enum XF_EXIT_CODE
 	XF_EXIT_UNKNOWN = 255,
 };
 
-#define xf_lock_x11(xfc) xf_lock_x11_(xfc, __FUNCTION__);
-#define xf_unlock_x11(xfc) xf_unlock_x11_(xfc, __FUNCTION__);
+#define xf_lock_x11(xfc) xf_lock_x11_(xfc, __FUNCTION__)
+#define xf_unlock_x11(xfc) xf_unlock_x11_(xfc, __FUNCTION__)
 
 void xf_lock_x11_(xfContext* xfc, const char* fkt);
 void xf_unlock_x11_(xfContext* xfc, const char* fkt);
diff --git a/client/common/file.c b/client/common/file.c
index 9b91ce2a9..6ef7d90c3 100644
--- a/client/common/file.c
+++ b/client/common/file.c
@@ -1230,13 +1230,19 @@ size_t freerdp_client_write_rdp_file_buffer(const rdpFile* file, char* buffer, s
 		totalSize += (size_t)res;                                                           \
 	}
 
-#define WRITE_SETTING_INT(fmt_, param_) \
-	if (~(param_))                      \
-	WRITE_SETTING_(fmt_, param_)
+#define WRITE_SETTING_INT(fmt_, param_)  \
+	do                                   \
+	{                                    \
+		if (~(param_))                   \
+			WRITE_SETTING_(fmt_, param_) \
+	} while (0)
 
-#define WRITE_SETTING_STR(fmt_, param_) \
-	if (~(size_t)(param_))              \
-	WRITE_SETTING_(fmt_, param_)
+#define WRITE_SETTING_STR(fmt_, param_)  \
+	do                                   \
+	{                                    \
+		if (~(size_t)(param_))           \
+			WRITE_SETTING_(fmt_, param_) \
+	} while (0)
 
 	/* integer parameters */
 	WRITE_SETTING_INT("use multimon:i:%" PRIu32, file->UseMultiMon);