Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -389,22 +389,10 @@
      (else 
       (debug:print-info 0 *default-log-port* "using testpatt " args-testpatt " rtestpatt:" rtestpatt)
       args-testpatt))))
 
 ;;======================================================================
-(define (common:get-linktree)
-  (or (getenv "MT_LINKTREE")
-      (if *configdat*
-	  (configf:lookup *configdat* "setup" "linktree")
-	  #f)
-      (if (or *toppath* (getenv "MT_RUN_AREA_HOME"))
-	  (conc (or *toppath* (getenv "MT_RUN_AREA_HOME")) "/lt")
-	  #f)
-      (let* ((tp (common:get-toppath #f))
-	     (lt (conc tp "/lt")))
-	(if (not tp)(debug:print 0 *default-log-port* "WARNING: cannot calculate best path for linktree, using " lt))
-	lt)))
 
 (define (common:args-get-runname)
   (let ((res (or (args:get-arg "-runname")
 		 (args:get-arg ":runname")
 		 (getenv "MT_RUNNAME"))))

Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -679,10 +679,11 @@
 (define (common:get-area-path-signature)
   (message-digest-string (md5-primitive) *toppath*))
 
 (define (common:get-signature str)
   (message-digest-string (md5-primitive) str))
+
 
 ;;======================================================================
 ;; S Y S T E M   S T U F F
 ;;======================================================================
 

Index: configfmod.scm
==================================================================
--- configfmod.scm
+++ configfmod.scm
@@ -51,10 +51,23 @@
 (import commonmod)
 
 ;;======================================================================
 ;; move debug stuff to separate module then put these back where they belong
 ;;======================================================================
+
+(define (common:get-linktree)
+  (or (getenv "MT_LINKTREE")
+      (if *configdat*
+	  (configf:lookup *configdat* "setup" "linktree")
+	  #f)
+      (if (or *toppath* (getenv "MT_RUN_AREA_HOME"))
+	  (conc (or *toppath* (getenv "MT_RUN_AREA_HOME")) "/lt")
+	  #f)
+      (let* ((tp (common:get-toppath #f))
+	     (lt (conc tp "/lt")))
+	(if (not tp)(debug:print 0 *default-log-port* "WARNING: cannot calculate best path for linktree, using " lt))
+	lt)))
 
 (define (common:get-testsuite-name)
   (or (configf:lookup *configdat* "setup" "area-name") ;; megatest is a flexible tool, testsuite is too limiting a description.
       (configf:lookup *configdat* "setup" "testsuite" )
       (getenv "MT_TESTSUITE_NAME")

Index: transport.scm
==================================================================
--- transport.scm
+++ transport.scm
@@ -19,22 +19,22 @@
 ;;======================================================================
 
 (declare (unit transport))
 (declare (uses commonmod))
 (declare (uses configfmod))
+(declare (uses portlogger))
 
 (module transport
 	*
 	
+(import scheme chicken data-structures extras ports)
+
 (import commonmod)
 (import configfmod)
-(declare (uses portlogger))
-(declare (uses portlogger.import))
 
 (import portlogger)
 
-(import scheme chicken data-structures extras ports)
 (import
   (prefix base64 base64:)
   (prefix sqlite3 sqlite3:)
   call-with-environment-variables
   csv