diff --git a/channels/rdpdr/disk/disk_file.c b/channels/rdpdr/disk/disk_file.c
index 3221a257c..846e3b774 100644
--- a/channels/rdpdr/disk/disk_file.c
+++ b/channels/rdpdr/disk/disk_file.c
@@ -566,7 +566,7 @@ boolean disk_file_query_directory(DISK_FILE* file, uint32 FsInformationClass, ui
 	}
 	xfree(ent_path);
 
-	DEBUG_SVC("  pattern %s matched %s\n", file->pattern, ent_path);
+	DEBUG_SVC("  pattern %s matched %s", file->pattern, ent_path);
 
 	uniconv = freerdp_uniconv_new();
 	ent_path = freerdp_uniconv_out(uniconv, ent->d_name, &len);
diff --git a/channels/rdpdr/disk/disk_main.c b/channels/rdpdr/disk/disk_main.c
index 5f820c6c0..8cca5d917 100644
--- a/channels/rdpdr/disk/disk_main.c
+++ b/channels/rdpdr/disk/disk_main.c
@@ -76,7 +76,7 @@ disk_map_posix_err(int fs_errno)
 			rc = STATUS_UNSUCCESSFUL;
 			break;
 	}
-	DEBUG_SVC("errno 0x%x mapped to 0x%x\n", fs_errno, rc);
+	DEBUG_SVC("errno 0x%x mapped to 0x%x", fs_errno, rc);
 	return rc;
 }
 
diff --git a/channels/rdpdr/rdpdr_main.c b/channels/rdpdr/rdpdr_main.c
index 714dd3f7f..f9d9a587a 100644
--- a/channels/rdpdr/rdpdr_main.c
+++ b/channels/rdpdr/rdpdr_main.c
@@ -293,7 +293,7 @@ static void rdpdr_process_receive(rdpSvcPlugin* plugin, STREAM* data_in)
 	}
 	else
 	{
-		DEBUG_WARN("RDPDR component: 0x%02X packetID: 0x%02X\n", component, packetID);
+		DEBUG_WARN("RDPDR component: 0x%02X packetID: 0x%02X", component, packetID);
 	}
 
 	stream_free(data_in);
diff --git a/channels/rdpdr/smartcard/scard_operations.c b/channels/rdpdr/smartcard/scard_operations.c
index c04f3e03a..0551a5015 100644
--- a/channels/rdpdr/smartcard/scard_operations.c
+++ b/channels/rdpdr/smartcard/scard_operations.c
@@ -497,7 +497,7 @@ static uint32 handle_GetStatusChange(IRP* irp, boolean wide)
 		cur = &readerStates[i];
 
 		DEBUG_SCARD("   \"%s\"", cur->szReader ? cur->szReader : "NULL");
-		DEBUG_SCARD("       user: 0x%08x, state: 0x%08x, event: 0x%08x\n",
+		DEBUG_SCARD("       user: 0x%08x, state: 0x%08x, event: 0x%08x",
 			(unsigned) cur->pvUserData, (unsigned) cur->dwCurrentState,
 			(unsigned) cur->dwEventState);
 
@@ -529,9 +529,9 @@ static uint32 handle_Cancel(IRP *irp)
 	rv = SCardCancel(hContext);
 
 	if (rv != SCARD_S_SUCCESS)
-		DEBUG_SCARD("Failure: %s (0x%08x)\n", pcsc_stringify_error(rv), (unsigned) rv);
+		DEBUG_SCARD("Failure: %s (0x%08x)", pcsc_stringify_error(rv), (unsigned) rv);
 	else
-		DEBUG_SCARD("Success context: 0x%08x %s\n", (unsigned) hContext, pcsc_stringify_error(rv));
+		DEBUG_SCARD("Success context: 0x%08x %s", (unsigned) hContext, pcsc_stringify_error(rv));
 
 	sc_output_alignment(irp, 8);
 
@@ -1062,7 +1062,7 @@ static uint32 handle_GetAttrib(IRP* irp)
 	stream_seek(irp->input, 0xC);
 	stream_read_uint32(irp->input, hCard);
 
-	DEBUG_SCARD("hcard: 0x%08x, attrib: 0x%08x (%d bytes)\n",
+	DEBUG_SCARD("hcard: 0x%08x, attrib: 0x%08x (%d bytes)",
 		(unsigned) hCard, (unsigned) dwAttrId, (int) dwAttrLen);
 
 #ifdef SCARD_AUTOALLOCATE
diff --git a/client/Windows/wf_event.c b/client/Windows/wf_event.c
index e2f04d3bb..51dcd71cf 100644
--- a/client/Windows/wf_event.c
+++ b/client/Windows/wf_event.c
@@ -40,7 +40,7 @@ LRESULT CALLBACK wf_ll_kbd_proc(int nCode, WPARAM wParam, LPARAM lParam)
 	uint16 kbdFlags;
 	PKBDLLHOOKSTRUCT p;
 
-	DEBUG_KBD("Low-level keyboard hook, hWnd %X nCode %X wParam %X\n", g_focus_hWnd, nCode, wParam);
+	DEBUG_KBD("Low-level keyboard hook, hWnd %X nCode %X wParam %X", g_focus_hWnd, nCode, wParam);
 
 	if (g_focus_hWnd && (nCode == HC_ACTION))
 	{
@@ -57,7 +57,7 @@ LRESULT CALLBACK wf_ll_kbd_proc(int nCode, WPARAM wParam, LPARAM lParam)
 				flags = p->flags;
 				kbdFlags = 0;
 
-				DEBUG_KBD("keydown %d scanCode %04X flags %02X vkCode %02X\n",
+				DEBUG_KBD("keydown %d scanCode %04X flags %02X vkCode %02X",
 					(wParam == WM_KEYDOWN), scanCode, flags, p->vkCode);
 
 				if (wfi->fs_toggle &&
@@ -75,7 +75,7 @@ LRESULT CALLBACK wf_ll_kbd_proc(int nCode, WPARAM wParam, LPARAM lParam)
 					if (flags & LLKHF_EXTENDED)
 					{
 						/* Windows sends NumLock as extended - rdp doesn't */
-						DEBUG_KBD("hack: NumLock (x45) should not be extended\n");
+						DEBUG_KBD("hack: NumLock (x45) should not be extended");
 						flags &= ~LLKHF_EXTENDED;
 					}
 					else
@@ -84,7 +84,7 @@ LRESULT CALLBACK wf_ll_kbd_proc(int nCode, WPARAM wParam, LPARAM lParam)
 						 * It must however be sent as a one-shot Ctrl+NumLock */
 						if (wParam == WM_KEYDOWN)
 						{
-							DEBUG_KBD("Pause, sent as Ctrl+NumLock\n");
+							DEBUG_KBD("Pause, sent as Ctrl+NumLock");
 							input->KeyboardEvent(input, KBD_FLAGS_DOWN, 0x1D); /* Ctrl down */
 							input->KeyboardEvent(input, KBD_FLAGS_DOWN, 0x45); /* NumLock down */
 							input->KeyboardEvent(input, KBD_FLAGS_RELEASE, 0x1D); /* Ctrl up */
@@ -92,7 +92,7 @@ LRESULT CALLBACK wf_ll_kbd_proc(int nCode, WPARAM wParam, LPARAM lParam)
 						}
 						else
 						{
-							DEBUG_KBD("Pause up\n");
+							DEBUG_KBD("Pause up");
 						}
 
 						return 1;
@@ -101,7 +101,7 @@ LRESULT CALLBACK wf_ll_kbd_proc(int nCode, WPARAM wParam, LPARAM lParam)
 
 				if ((scanCode == 0x36) && (flags & LLKHF_EXTENDED))
 				{
-					DEBUG_KBD("hack: right shift (x36) should not be extended\n");
+					DEBUG_KBD("hack: right shift (x36) should not be extended");
 					flags &= ~LLKHF_EXTENDED;
 				}
 
@@ -110,7 +110,7 @@ LRESULT CALLBACK wf_ll_kbd_proc(int nCode, WPARAM wParam, LPARAM lParam)
 				input->KeyboardEvent(input, kbdFlags, scanCode);
 
 				if (p->vkCode == VK_CAPITAL)
-					DEBUG_KBD("caps lock is processed on client side too to toggle caps lock indicator\n");
+					DEBUG_KBD("caps lock is processed on client side too to toggle caps lock indicator");
 				else
 					return 1;
 
@@ -204,12 +204,12 @@ LRESULT CALLBACK wf_event_proc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam
 			break;
 
 		case WM_SETFOCUS:
-			DEBUG_KBD("getting focus %X\n", hWnd);
+			DEBUG_KBD("getting focus %X", hWnd);
 			g_focus_hWnd = hWnd;
 			break;
 
 		case WM_KILLFOCUS:
-			DEBUG_KBD("loosing focus %X\n", hWnd);
+			DEBUG_KBD("loosing focus %X", hWnd);
 			if (g_focus_hWnd == hWnd)
 				g_focus_hWnd = NULL;
 			break;
diff --git a/libfreerdp-core/tcp.c b/libfreerdp-core/tcp.c
index 095f369af..74e3abe08 100644
--- a/libfreerdp-core/tcp.c
+++ b/libfreerdp-core/tcp.c
@@ -127,7 +127,7 @@ boolean tcp_connect(rdpTcp* tcp, const char* hostname, uint16 port)
 
 	if (status != 0)
 	{
-		printf("transport_connect: getaddrinfo (%s)\n", gai_strerror(status));
+		printf("tcp_connect: getaddrinfo (%s)\n", gai_strerror(status));
 		return false;
 	}
 
diff --git a/libfreerdp-locale/keyboard_x11.c b/libfreerdp-locale/keyboard_x11.c
index 0376f73f3..dba29c85b 100644
--- a/libfreerdp-locale/keyboard_x11.c
+++ b/libfreerdp-locale/keyboard_x11.c
@@ -949,7 +949,7 @@ uint32 find_keyboard_layout_in_xorg_rules(char* layout, char* variant)
 	if ((layout == NULL) || (variant == NULL))
 		return 0;
 
-	DEBUG_KBD("xkbLayout: %s\txkbVariant: %s\n", layout, variant);
+	DEBUG_KBD("xkbLayout: %s\txkbVariant: %s", layout, variant);
 
 	for (i = 0; i < sizeof(xkbLayouts) / sizeof(XKB_LAYOUT); i++)
 	{