diff --git a/script/benchmark b/script/benchmark
index 75b137ed..6398ebe7 100755
--- a/script/benchmark
+++ b/script/benchmark
@@ -59,6 +59,7 @@ while getopts "bdhf:l:SL" option; do
 done
 
 if [[ -n "$run_scan_build" ]]; then
+  . script/util/scan-build.sh
   scan_build make -j2 $target
 else
   make -j2 benchmarks
diff --git a/script/ci b/script/ci
index 5360ccb5..7e9c1f39 100755
--- a/script/ci
+++ b/script/ci
@@ -2,8 +2,6 @@
 
 set -e
 
-. script/lib.sh
-
 script/fetch-fixtures
 script/check-mallocs
 script/test -b
diff --git a/script/test b/script/test
index cec9845d..e582929a 100755
--- a/script/test
+++ b/script/test
@@ -2,8 +2,6 @@
 
 set -e
 
-. script/lib.sh
-
 function usage {
   cat <<-EOF
 USAGE
@@ -92,6 +90,7 @@ else
 fi
 
 if [[ -n "$run_scan_build" ]]; then
+  . script/util/scan-build.sh
   scan_build make -j2 $target
 else
   make -j2 $target
diff --git a/script/lib.sh b/script/util/scan-build.sh
similarity index 97%
rename from script/lib.sh
rename to script/util/scan-build.sh
index 03e24796..9060b1a8 100755
--- a/script/lib.sh
+++ b/script/util/scan-build.sh
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 function scan_build {
   extra_args=()