Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -116,11 +116,10 @@
 	keys.o \
 	launch.o \
 	lock-queue.o \
 	margs.o \
 	mt.o \
-	ods.o \
 	portlogger.o \
 	process.o \
 	rmt.o \
 	runconfig.o \
 	runs.o \
@@ -129,10 +128,11 @@
 	tdb.o \
 	tests.o \
 	subrun.o \
         ezsteps.o
 
+# 	 ods.o \
 #        mofiles/rmtmod.o \
 #        mofiles/commonmod.o \
 
 tcmt : $(TCMTOBJS) tcmt.scm megatest-version.scm $(MOIMPFILES) $(MOFILES)
 	csc $(CSCOPTS) $(TCMTOBJS) $(MOFILES) $(MOIMPFILES) tcmt.scm -o tcmt
@@ -464,12 +464,12 @@
 	fi
 	if csi -ne '(use postgresql)';then \
 	   echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\
 	fi
 
-portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o mt.o ods.o portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
-	csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o mt.o ods.o portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
+portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o mt.o portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
+	csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o mt.o portlogger.o process.o rmt.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o
 
 # create a pdf dot graphviz diagram from notations in rmt.scm
 rmt.pdf : rmt.scm
 	grep ';;DOT' rmt.scm | sed -e 's/.*;;DOT //' > rmt.dot;dot -Tpdf rmt.dot -o rmt.pdf
 

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -57,10 +57,17 @@
 (declare (uses dcommonmod.import))
 
 (declare (uses apimod))
 (import apimod)
 
+;; (declare (uses ods))
+;; (import ods)
+;; 
+(declare (uses dbmod))
+(import dbmod)
+;; (declare (uses dbmod.import))
+;; 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")
 (include "megatest-version.scm")
@@ -253,12 +260,12 @@
     (dboard:setup-tabdat dat)
     (dboard:setup-num-rows dat)
     dat))
 
 (define (dboard:setup-tabdat tabdat)
-  (dboard:tabdat-dbdir-set! tabdat (db:dbfile-path)) ;; (conc (configf:lookup *configdat* "setup" "linktree") "/.db"))
-  (dboard:tabdat-dbfpath-set! tabdat (db:dbfile-path))
+  (dboard:tabdat-dbdir-set! tabdat (common:get-db-tmp-area)) ;; (conc (configf:lookup *configdat* "setup" "linktree") "/.db"))
+  (dboard:tabdat-dbfpath-set! tabdat (common:get-db-tmp-area))
   (dboard:tabdat-monitor-db-path-set! tabdat (conc (dboard:tabdat-dbdir tabdat) "/monitor.db"))
 
   ;; HACK ALERT: this is a hack, please fix.
   (dboard:tabdat-ro-set! tabdat (not (file-read-access? (dboard:tabdat-dbfpath tabdat))))
   

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -47,10 +47,14 @@
 ;; Needed for repl even if not used here in megatest.scm
 (declare (uses commonmod))
 (import commonmod)
 (declare (uses commonmod.import))
 
+(declare (uses ods))
+(import ods)
+(declare (uses ods.import))
+
 (declare (uses dbmod))
 (import dbmod)
 (declare (uses dbmod.import))
 
 (declare (uses servermod))

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -30,10 +30,14 @@
 (declare (uses apimod))
 (import apimod)
 
 (declare (uses rmtmod))
 (import rmtmod)
+
+;; should not be here
+(declare (uses dbmod))
+(import dbmod)
 
 (include "common_records.scm")
 ;; (declare (uses rmtmod))
 
 ;; (import rmtmod)
@@ -385,11 +389,11 @@
     (mutex-unlock! *db-stats-mutex*)
     res))
 
 (define (rmt:open-qry-close-locally cmd run-id params #!key (remretries 5))
   (let* ((qry-is-write   (not (member cmd api:read-only-queries)))
-	 (db-file-path   (db:dbfile-path)) ;;  0))
+	 (db-file-path   (common:get-db-tmp-area)) ;; db:dbfile-path)) ;;  0))
 	 (dbstruct-local (db:setup #t))  ;; make-dbr:dbstruct path:  dbdir local: #t)))
 	 (read-only      (not (file-write-access? db-file-path)))
 	 (start          (current-milliseconds))
 	 (resdat         (if (not (and read-only qry-is-write))
 			     (let ((v (api:execute-requests dbstruct-local (vector (symbol->string cmd) params))))

Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -28,17 +28,19 @@
 (import (prefix base64 base64:))
 
 (declare (unit tdb))
 (declare (uses common))
 (declare (uses keys))
-(declare (uses ods))
 (declare (uses client))
 (declare (uses mt))
 (declare (uses db))
 
 (declare (uses commonmod))
 (import commonmod)
+
+(declare (uses ods))
+(import ods)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
 (include "run_records.scm")