diff --git a/libfreerdp-cache/brush.c b/libfreerdp-cache/brush.c
index 4dc5bfd26..2aabfe83b 100644
--- a/libfreerdp-cache/brush.c
+++ b/libfreerdp-cache/brush.c
@@ -160,7 +160,7 @@ void brush_cache_free(rdpBrushCache* brush)
 	{
 		if (brush->entries != NULL)
 		{
-			for (i = 0; i < brush->maxEntries; i++)
+			for (i = 0; i < (int) brush->maxEntries; i++)
 			{
 				if (brush->entries[i].entry != NULL)
 					xfree(brush->entries[i].entry);
@@ -171,7 +171,7 @@ void brush_cache_free(rdpBrushCache* brush)
 
 		if (brush->monoEntries != NULL)
 		{
-			for (i = 0; i < brush->maxMonoEntries; i++)
+			for (i = 0; i < (int) brush->maxMonoEntries; i++)
 			{
 				if (brush->monoEntries[i].entry != NULL)
 					xfree(brush->monoEntries[i].entry);
diff --git a/libfreerdp-utils/file.c b/libfreerdp-utils/file.c
index 0d5a8d224..350a92a8d 100644
--- a/libfreerdp-utils/file.c
+++ b/libfreerdp-utils/file.c
@@ -20,14 +20,22 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/stat.h>
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #include <freerdp/types.h>
 #include <freerdp/settings.h>
 #include <freerdp/utils/memory.h>
 #include <freerdp/utils/string.h>
 
+#ifdef _WIN32
+#include <direct.h>
+#define getcwd			_getcwd
+#endif
+
 #include <freerdp/utils/file.h>
 
 #ifndef _WIN32