4 files changed, 19 insertions, 4 deletions
diff --git a/unit-tests/function/buildfile b/unit-tests/function/buildfile
index 3631958..4d2862c 100644
--- a/unit-tests/function/buildfile
+++ b/unit-tests/function/buildfile
@@ -13,7 +13,6 @@ functions-builtin functions-path functions-process-path functions-string \
 functions-target-triplet algorithm search dump filesystem scheduler \
 config/{utility init operation}
 
-
 exe{driver}: cxx{driver} ../../build2/cxx{$src} $libs test{call syntax}
 
 include ../../build2/
diff --git a/unit-tests/lexer/buildfile b/unit-tests/lexer/buildfile
index 3ad0ac6..f37c7cf 100644
--- a/unit-tests/lexer/buildfile
+++ b/unit-tests/lexer/buildfile
@@ -4,8 +4,14 @@
 
 #@@ Temporary until we get utility library support.
 #
+if ($cxx.target.class != "windows")
+  cxx.libs += -lpthread
 import libs = libbutl%lib{butl}
-src = token lexer diagnostics utility variable name b-options types-parsers
+src = token lexer diagnostics utility variable name b-options types-parsers \
+context scope parser target operation rule prerequisite file module function \
+functions-builtin functions-path functions-process-path functions-string \
+functions-target-triplet algorithm search dump filesystem scheduler \
+config/{utility init operation}
 
 exe{driver}: cxx{driver} ../../build2/cxx{$src} $libs \
 test{comment eval quoting}
diff --git a/unit-tests/scheduler/buildfile b/unit-tests/scheduler/buildfile
index 2e79c16..056930e 100644
--- a/unit-tests/scheduler/buildfile
+++ b/unit-tests/scheduler/buildfile
@@ -7,7 +7,12 @@
 if ($cxx.target.class != "windows")
   cxx.libs += -lpthread
 import libs = libbutl%lib{butl}
-src = scheduler diagnostics utility variable name b-options types-parsers
+src = token lexer diagnostics utility variable name b-options types-parsers \
+context scope parser target operation rule prerequisite file module function \
+functions-builtin functions-path functions-process-path functions-string \
+functions-target-triplet algorithm search dump filesystem scheduler \
+config/{utility init operation}
+
 
 exe{driver}: cxx{driver} ../../build2/cxx{$src} $libs
 
diff --git a/unit-tests/test/script/lexer/buildfile b/unit-tests/test/script/lexer/buildfile
index 43df2e3..aaeadc9 100644
--- a/unit-tests/test/script/lexer/buildfile
+++ b/unit-tests/test/script/lexer/buildfile
@@ -4,9 +4,14 @@
 
 #@@ Temporary until we get utility library support.
 #
+if ($cxx.target.class != "windows")
+  cxx.libs += -lpthread
 import libs = libbutl%lib{butl}
 src = token lexer diagnostics utility variable name b-options types-parsers \
-test/script/{token lexer}
+context scope parser target operation rule prerequisite file module function \
+functions-builtin functions-path functions-process-path functions-string \
+functions-target-triplet algorithm search dump filesystem scheduler \
+config/{utility init operation} test/script/{token lexer}
 
 exe{driver}: cxx{driver} ../../../../build2/cxx{$src} $libs \
 test{command-line first-token second-token command-expansion variable-line \