@@ -18,11 +18,12 @@
 ;;
 
 
 (declare (unit portlogger))
 (declare (uses debugprint))
-(declare (uses dbmod))
+(declare (uses commonmod))
+;; (declare (uses dbmod))
 
 (module portlogger
 *
 
 (import scheme)
@@ -35,11 +36,10 @@
 	  ;; dot-locking
 	  extras
 	  )
   
   (import (prefix sqlite3 sqlite3:))
-  (import debugprint dbmod)
   )
  (chicken-5
   (import chicken.base
 	  chicken.condition
 	  chicken.file
@@ -58,11 +58,14 @@
   ))
 
 (import srfi-1 srfi-69 z3
 	(srfi 18) s11n)
 (import (prefix sqlite3 sqlite3:))
-(import debugprint dbmod)
+(import debugprint
+	;; dbmod
+	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