Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -22,16 +22,17 @@
      format dot-locking csv-xml z3 udp ;; sql-de-lite
      hostinfo md5 message-digest typed-records directory-utils stack
      matchable regex posix (srfi 18) extras ;; tcp 
      (prefix nanomsg nmsg:)
      (prefix sqlite3 sqlite3:)
-     pkts (prefix dbi dbi:)
+     (prefix dbi dbi:)
      )
 
 (declare (unit common))
 (declare (uses commonmod))
 (import commonmod)
+(import pkts)
 
 (include "common_records.scm")
 
 
 ;; (require-library margs)

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -23,11 +23,11 @@
 (require-library iup)
 (import (prefix iup iup:))
 
 (use canvas-draw)
 (import canvas-draw-iup)
-(use ducttape-lib)
+(import ducttape-lib)
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors) ;; defstruct
 (import (prefix sqlite3 sqlite3:))
 
 (declare (uses common))
 (declare (uses margs))

Index: diff-report.scm
==================================================================
--- diff-report.scm
+++ diff-report.scm
@@ -21,11 +21,11 @@
 (declare (uses rmt))
          
 (include "common_records.scm")
 (use matchable)
 (use fmt)
-(use ducttape-lib)
+(import ducttape-lib)
 (define css "")
 
 (define (diff:tests-mindat->hash tests-mindat)
   (let* ((res (make-hash-table)))
     (for-each

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -28,11 +28,11 @@
 
 ;; Added for csv stuff - will be removed
 ;;
 (use sparse-vectors)
 
-(require-library mutils)
+(import mutils ducttape-lib)
 
 ;; (use zmq)
 
 (declare (uses common))
 (declare (uses megatest-version))

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -21,21 +21,21 @@
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
 (use srfi-1 posix srfi-69 readline ;;  regex regex-case srfi-69 apropos json http-client directory-utils rpc typed-records;; (srfi 18) extras)
-   srfi-19  srfi-18 extras format pkts regex regex-case
+   srfi-19  srfi-18 extras format regex regex-case
      (prefix dbi dbi:)
      nanomsg)
 
 (declare (uses common))
 (declare (uses megatest-version))
 (declare (uses margs))
 (declare (uses configf))
 ;; (declare (uses rmt))
 
-(use ducttape-lib)
+(import ducttape-lib pkts)
 
 (include "megatest-fossil-hash.scm")
 
 (import stml2)