diff --git a/src/core-utils/gnc-gkeyfile-utils.c b/src/core-utils/gnc-gkeyfile-utils.c
index cffcad07a1..5d09107c46 100644
--- a/src/core-utils/gnc-gkeyfile-utils.c
+++ b/src/core-utils/gnc-gkeyfile-utils.c
@@ -42,7 +42,16 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#else
+# ifdef _MSC_VER
+/* MSVC compatibility code */
+#  include <io.h>
+#  define write _write
+#  define ssize_t int
+# endif
+#endif
 
 #include "gnc-gkeyfile-utils.h"
 
diff --git a/src/engine/Query.c b/src/engine/Query.c
index 09bd9f38ee..2124f031e0 100644
--- a/src/engine/Query.c
+++ b/src/engine/Query.c
@@ -30,8 +30,12 @@
 #include <sys/types.h>
 
 #include <regex.h>
-#include <sys/time.h>
-#include <unistd.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #include "gnc-lot.h"
 #include "Account.h"
diff --git a/src/engine/Split.c b/src/engine/Split.c
index 4f689b725f..848658663e 100644
--- a/src/engine/Split.c
+++ b/src/engine/Split.c
@@ -30,9 +30,13 @@
 #include <glib/gi18n.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/time.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
 #include <time.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #include "qof.h"
 #include "Split.h"
diff --git a/src/engine/Transaction.c b/src/engine/Transaction.c
index a135d06c7e..f9ca3d06a1 100644
--- a/src/engine/Transaction.c
+++ b/src/engine/Transaction.c
@@ -30,9 +30,20 @@
 #include <glib/gi18n.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/time.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#else
+/* We simply define the struct timeval on our own here. */
+struct timeval {
+        long    tv_sec;         /* seconds */
+        long    tv_usec;        /* and microseconds */
+};
+/* include <Winsock2.h> */
+#endif
 #include <time.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #include "AccountP.h"
 #include "Scrub.h"
diff --git a/src/engine/gnc-filepath-utils.c b/src/engine/gnc-filepath-utils.c
index 9b90f111ba..943023f41f 100644
--- a/src/engine/gnc-filepath-utils.c
+++ b/src/engine/gnc-filepath-utils.c
@@ -42,7 +42,9 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 #include <errno.h>
 
 #include "gnc-engine.h"
diff --git a/src/gnc-module/gnc-module.c b/src/gnc-module/gnc-module.c
index ff2d29dddc..7187426dae 100644
--- a/src/gnc-module/gnc-module.c
+++ b/src/gnc-module/gnc-module.c
@@ -10,7 +10,9 @@
 #include <string.h>
 #include <gmodule.h>
 #include <sys/types.h>
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
 
 #include "gnc-module.h"