@@ -19,13 +19,35 @@
 ;;======================================================================
 ;; launch a task - this runs on the originating host, tests themselves
 ;;
 ;;======================================================================
 
-(use regex regex-case base64 sqlite3 srfi-18 directory-utils posix-extras z3
-     call-with-environment-variables csv)
-(use typed-records pathname-expand matchable)
+(import
+ chicken.bitwise
+ chicken.condition
+ chicken.file
+ chicken.file.posix
+ chicken.io
+ chicken.pathname
+ chicken.port
+ chicken.pretty-print
+ chicken.process
+ chicken.process-context
+ chicken.process-context.posix
+ chicken.process.signal
+ chicken.sort
+ chicken.string
+ chicken.time
+ srfi-1
+ srfi-69
+ system-information
+
+ regex regex-case base64 sqlite3 srfi-18 directory-utils
+ ;; posix-extras
+ z3
+ ;; call-with-environment-variables csv)
+ typed-records pathname-expand matchable)
 
 (import (prefix base64 base64:))
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit launch))
@@ -33,10 +55,13 @@
 (declare (uses common))
 (declare (uses configf))
 (declare (uses db))
 (declare (uses ezsteps))
 
+(define getenv get-environment-variable)
+(define setenv set-environment-variable!)
+
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "megatest-fossil-hash.scm")