diff --git a/src/ChangeLog b/src/ChangeLog
index 82aa35a0aa..ccee68a7ae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,6 +6,7 @@
 	* BufferView_pimpl.C:
 	* DepTable.C:
 	* buffer.C:
+	* lyxserver.C: 
 	* lyxvc.C: use the HAVE_UNISTD_H guard.
 
 2005-01-19  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
diff --git a/src/lyxserver.C b/src/lyxserver.C
index 4ec7a43dda..7934bfd459 100644
--- a/src/lyxserver.C
+++ b/src/lyxserver.C
@@ -38,7 +38,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <fcntl.h>
 #include <cerrno>
 
diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 852382daa0..10e37e6b2a 100644
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -2,6 +2,7 @@
 
 	* FileInfo.h:
 	* chdir.C:
+	* forkedcall.C: 
 	* forkedcontr.C:
 	* getcwd.C:
 	* lyxsum.C:
diff --git a/src/support/forkedcall.C b/src/support/forkedcall.C
index c3e6938098..93e2d634ee 100644
--- a/src/support/forkedcall.C
+++ b/src/support/forkedcall.C
@@ -40,7 +40,9 @@
 #include <sys/wait.h>
 #include <csignal>
 #include <cstdlib>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 using std::endl;