diff --git a/configure.ac b/configure.ac
index 0eb7d76325..5816d75e50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,7 +116,7 @@ AC_CHECK_HEADERS([sys/mount.h], [], [],
 
 
 # Check for vfork.
-AC_FUNC_FORK()
+#AC_FUNC_FORK()
 
 
 # Check for lutimes, optionally used for changing the mtime of
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 2fd071ebad..9e0db9ee7f 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -355,7 +355,7 @@ void Goal::trace(const format & f)
 
 
 /* Common initialisation performed in child processes. */
-void commonChildInit(Pipe & logPipe)
+static void commonChildInit(Pipe & logPipe)
 {
     /* Put the child in a separate session (and thus a separate
        process group) so that it has no controlling terminal (meaning