diff --git a/client/X11/xf_client.c b/client/X11/xf_client.c
index 5707a12fc..1e6fcc0c2 100644
--- a/client/X11/xf_client.c
+++ b/client/X11/xf_client.c
@@ -1427,8 +1427,8 @@ void* xf_client_thread(void* param)
 	xfContext* xfc;
 	freerdp* instance;
 	rdpContext* context;
-	HANDLE inputEvent;
-	HANDLE inputThread;
+	HANDLE inputEvent = NULL;
+	HANDLE inputThread = NULL;
 	rdpChannels* channels;
 	rdpSettings* settings;
 
diff --git a/client/X11/xf_keyboard.c b/client/X11/xf_keyboard.c
index fdb435d51..963055639 100644
--- a/client/X11/xf_keyboard.c
+++ b/client/X11/xf_keyboard.c
@@ -45,7 +45,6 @@
 
 BOOL xf_keyboard_action_script_init(xfContext* xfc)
 {
-	int exitCode;
 	FILE* keyScript;
 	char* keyCombination;
 	char buffer[1024] = { 0 };