diff --git a/.gitignore b/.gitignore
index 75c8ac10cb..483d976472 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,3 +125,4 @@ po/.intltool-merge-cache
 src/bin/gnucash-bin.o
 gnucash-*.*.*/
 gnucash-*.*.*.tar.*
+build*
diff --git a/src/backend/xml/gnc-backend-xml.c b/src/backend/xml/gnc-backend-xml.c
index 104166bc79..82c6b235df 100644
--- a/src/backend/xml/gnc-backend-xml.c
+++ b/src/backend/xml/gnc-backend-xml.c
@@ -39,10 +39,18 @@
 #include <limits.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#else
+# ifdef _MSC_VER
+typedef int ssize_t;
+# endif
+#endif
 #include <errno.h>
 #include <string.h>
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
 #include <time.h>
 
 #include "qof.h"
diff --git a/src/backend/xml/io-example-account.c b/src/backend/xml/io-example-account.c
index e8cda17a81..a260c76873 100644
--- a/src/backend/xml/io-example-account.c
+++ b/src/backend/xml/io-example-account.c
@@ -26,10 +26,14 @@
 
 #include <sys/types.h>
 #include <ctype.h>
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
 #include <string.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #include <glib.h>
 #include <glib/gi18n.h>
diff --git a/src/backend/xml/io-gncxml-v2.c b/src/backend/xml/io-gncxml-v2.c
index 4f26b67140..8b7cd0db2d 100644
--- a/src/backend/xml/io-gncxml-v2.c
+++ b/src/backend/xml/io-gncxml-v2.c
@@ -25,7 +25,9 @@
 #include <glib/gstdio.h>
 #include <fcntl.h>
 #include <string.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 #include <zlib.h>
 #include <errno.h>
 
diff --git a/src/libqof/qof/md5.c b/src/libqof/qof/md5.c
index c7e245f4b6..8912106663 100644
--- a/src/libqof/qof/md5.c
+++ b/src/libqof/qof/md5.c
@@ -32,7 +32,7 @@
 #else
 # ifndef HAVE_MEMCPY
 #include <string.h>
-#  define memcpy(d, s, n) bcopy ((s), (d), (n))
+/* #  define memcpy(d, s, n) bcopy ((s), (d), (n)) */
 # endif
 #endif