diff --git a/client/common/client.c b/client/common/client.c
index 4dc46008c..1fc565f9a 100644
--- a/client/common/client.c
+++ b/client/common/client.c
@@ -160,32 +160,6 @@ int freerdp_client_settings_write_connection_file(const rdpSettings* settings, c
 	if (!freerdp_client_populate_rdp_file_from_settings(file, settings))
 		return -1;
 
-	{
-		int index;
-		rdpFileLine* line;
-
-		for (index = 0; index < file->lineCount; index++)
-		{
-			line = &(file->lines[index]);
-
-			if (line->flags & RDP_FILE_LINE_FLAG_FORMATTED)
-			{
-				if (line->flags & RDP_FILE_LINE_FLAG_TYPE_STRING)
-				{
-					printf("line %02d: name: %s value: %s, %s\n",
-						line->index, line->name, line->sValue,
-						(line->flags & RDP_FILE_LINE_FLAG_STANDARD) ? "standard" : "non-standard");
-				}
-				else if (line->flags & RDP_FILE_LINE_FLAG_TYPE_INTEGER)
-				{
-					printf("line %02d: name: %s value: %d, %s\n",
-						line->index, line->name, line->iValue,
-						(line->flags & RDP_FILE_LINE_FLAG_STANDARD) ? "standard" : "non-standard");
-				}
-			}
-		}
-	}
-
 	if (!freerdp_client_write_rdp_file(file, filename, unicode))
 		return -1;
 
diff --git a/client/common/file.c b/client/common/file.c
index 6e93f3a95..3cf052f14 100644
--- a/client/common/file.c
+++ b/client/common/file.c
@@ -893,8 +893,6 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings*
 		freerdp_set_param_string(settings, FreeRDP_RemoteApplicationIcon, file->RemoteApplicationIcon);
 	if (~((size_t) file->RemoteApplicationFile))
 		freerdp_set_param_string(settings, FreeRDP_RemoteApplicationGuid, file->RemoteApplicationGuid);
-	if (~((size_t) file->RemoteApplicationGuid))
-		freerdp_set_param_string(settings, FreeRDP_RemoteApplicationGuid, file->RemoteApplicationGuid);
 	if (~((size_t) file->RemoteApplicationCmdLine))
 		freerdp_set_param_string(settings, FreeRDP_RemoteApplicationCmdLine, file->RemoteApplicationCmdLine);
 
diff --git a/winpr/libwinpr/utils/wlog/Message.c b/winpr/libwinpr/utils/wlog/Message.c
index 4f313c4a4..bb2fa5595 100644
--- a/winpr/libwinpr/utils/wlog/Message.c
+++ b/winpr/libwinpr/utils/wlog/Message.c
@@ -23,6 +23,7 @@
 
 #include <winpr/crt.h>
 #include <winpr/path.h>
+#include <winpr/file.h>
 
 #include <winpr/wlog.h>