Index: api.scm
==================================================================
--- api.scm
+++ api.scm
@@ -24,10 +24,13 @@
 
 (declare (unit api))
 (declare (uses rmt))
 (declare (uses db))
 (declare (uses tasks))
+
+(declare (uses commonmod))
+(import commonmod)
 
 ;; allow these queries through without starting a server
 ;;
 (define api:read-only-queries
   '(get-key-val-pairs

Index: env.scm
==================================================================
--- env.scm
+++ env.scm
@@ -17,10 +17,13 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
 (declare (unit env))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (use sql-de-lite) ;; srfi-1 posix regex regex-case srfi-69 srfi-18 call-with-environment-variables)
 
 (define (env:open-db fname)
   (let* ((db-exists (common:file-exists? fname))

Index: genexample.scm
==================================================================
--- genexample.scm
+++ genexample.scm
@@ -18,10 +18,13 @@
 
 ;;======================================================================
 
 (declare (unit genexample))
 (use posix regex matchable)
+
+(declare (uses commonmod))
+(import commonmod)
 
 (include "db_records.scm")
 
 (define genexample:example-logpro
 #<<EOF

Index: portlogger.scm
==================================================================
--- portlogger.scm
+++ portlogger.scm
@@ -22,10 +22,13 @@
 (use sqlite3 srfi-1 posix srfi-69 hostinfo dot-locking z3)
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit portlogger))
 (declare (uses db))
+
+(declare (uses commonmod))
+(import commonmod)
 
 ;; lsof -i
 
 (define (portlogger:open-db fname)
   (let* ((avail    (tasks:wait-on-journal fname 5 remove: #t)) ;; wait up to about 10 seconds for the journal to go away

Index: process.scm
==================================================================
--- process.scm
+++ process.scm
@@ -22,10 +22,13 @@
 ;; Process convience utils
 ;;======================================================================
 
 (use regex directory-utils)
 (declare (unit process))
+
+(declare (uses commonmod))
+(import commonmod)
 
 (define (process:conservative-read port)
   (let loop ((res ""))
     (if (not (eof-object? (peek-char port)))
 	(loop (conc res (read-char port)))