diff --git a/client/Sample/freerdp.c b/client/Sample/freerdp.c
index 3aae29b25..e05ef5e78 100644
--- a/client/Sample/freerdp.c
+++ b/client/Sample/freerdp.c
@@ -73,7 +73,7 @@ static BOOL tf_end_paint(rdpContext* context)
 
 	if (gdi->primary->hdc->hwnd->invalid->null)
 		return TRUE;
-    return TRUE;
+	return TRUE;
 }
 
 static BOOL tf_pre_connect(freerdp* instance)
diff --git a/client/X11/xf_rail.c b/client/X11/xf_rail.c
index e23f8e173..f3babfac1 100644
--- a/client/X11/xf_rail.c
+++ b/client/X11/xf_rail.c
@@ -600,7 +600,7 @@ static BOOL xf_rail_notify_icon_delete(rdpContext* context, WINDOW_ORDER_INFO* o
 
 static BOOL xf_rail_monitored_desktop(rdpContext* context, WINDOW_ORDER_INFO* orderInfo, MONITORED_DESKTOP_ORDER* monitoredDesktop)
 {
-		return TRUE;
+	return TRUE;
 }
 
 static BOOL xf_rail_non_monitored_desktop(rdpContext* context, WINDOW_ORDER_INFO* orderInfo)
diff --git a/server/Sample/sfreerdp.c b/server/Sample/sfreerdp.c
index 79fdcc454..6d33b72d6 100644
--- a/server/Sample/sfreerdp.c
+++ b/server/Sample/sfreerdp.c
@@ -558,7 +558,7 @@ BOOL tf_peer_activate(freerdp_peer* client)
 BOOL tf_peer_synchronize_event(rdpInput* input, UINT32 flags)
 {
 	WLog_DBG(TAG, "Client sent a synchronize event (flags:0x%X)", flags);
-    return TRUE;
+	return TRUE;
 }
 
 BOOL tf_peer_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code)
@@ -614,26 +614,26 @@ BOOL tf_peer_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code)
 	{
 
 	}
-    return TRUE;
+	return TRUE;
 }
 
 BOOL tf_peer_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code)
 {
 	WLog_DBG(TAG, "Client sent a unicode keyboard event (flags:0x%X code:0x%X)", flags, code);
-    return TRUE;
+	return TRUE;
 }
 
 BOOL tf_peer_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y)
 {
 	//WLog_DBG(TAG, "Client sent a mouse event (flags:0x%X pos:%d,%d)", flags, x, y);
 	test_peer_draw_icon(input->context->peer, x + 10, y);
-    return TRUE;
+	return TRUE;
 }
 
 BOOL tf_peer_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y)
 {
 	//WLog_DBG(TAG, "Client sent an extended mouse event (flags:0x%X pos:%d,%d)", flags, x, y);
-    return TRUE;
+	return TRUE;
 }
 
 static BOOL tf_peer_refresh_rect(rdpContext* context, BYTE count, RECTANGLE_16* areas)
@@ -645,7 +645,7 @@ static BOOL tf_peer_refresh_rect(rdpContext* context, BYTE count, RECTANGLE_16*
 	{
 		WLog_DBG(TAG, "  (%d, %d) (%d, %d)", areas[i].left, areas[i].top, areas[i].right, areas[i].bottom);
 	}
-    return TRUE;
+	return TRUE;
 }
 
 static BOOL tf_peer_suppress_output(rdpContext* context, BYTE allow, RECTANGLE_16* area)
@@ -658,7 +658,7 @@ static BOOL tf_peer_suppress_output(rdpContext* context, BYTE allow, RECTANGLE_1
 	{
 		WLog_DBG(TAG, "Client minimized and suppress output.");
 	}
-    return TRUE;
+	return TRUE;
 }
 
 static void* test_peer_mainloop(void* arg)
diff --git a/server/shadow/shadow_input.c b/server/shadow/shadow_input.c
index d998c8622..45ad38db6 100644
--- a/server/shadow/shadow_input.c
+++ b/server/shadow/shadow_input.c
@@ -34,7 +34,7 @@ BOOL shadow_input_synchronize_event(rdpInput* input, UINT32 flags)
 	{
 		subsystem->SynchronizeEvent(subsystem, flags);
 	}
-    return TRUE;
+	return TRUE;
 }
 
 BOOL shadow_input_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code)
@@ -49,7 +49,7 @@ BOOL shadow_input_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code)
 	{
 		subsystem->KeyboardEvent(subsystem, flags, code);
 	}
-    return TRUE;
+	return TRUE;
 }
 
 BOOL shadow_input_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code)
@@ -64,7 +64,7 @@ BOOL shadow_input_unicode_keyboard_event(rdpInput* input, UINT16 flags, UINT16 c
 	{
 		subsystem->UnicodeKeyboardEvent(subsystem, flags, code);
 	}
-    return TRUE;
+	return TRUE;
 }
 
 BOOL shadow_input_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y)
@@ -94,7 +94,7 @@ BOOL shadow_input_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y)
 	{
 		subsystem->MouseEvent(subsystem, flags, x, y);
 	}
-    return TRUE;
+	return TRUE;
 }
 
 BOOL shadow_input_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y)
@@ -112,7 +112,7 @@ BOOL shadow_input_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x,
 	{
 		subsystem->ExtendedMouseEvent(subsystem, flags, x, y);
 	}
-    return TRUE;
+	return TRUE;
 }
 
 void shadow_input_register_callbacks(rdpInput* input)