Index: common-inc.scm
==================================================================
--- common-inc.scm
+++ common-inc.scm
@@ -583,16 +583,10 @@
 				       (string-translate *toppath* "/" ".")))))) ;;  #t))))
 	      (set! *db-cache-path* dbpath)
 	      dbpath))
 	  #f)))
 
-(define (common:get-area-path-signature)
-  (message-digest-string (md5-primitive) *toppath*))
-
-(define (common:get-signature str)
-  (message-digest-string (md5-primitive) str))
-
 ;;======================================================================
 ;; E X I T   H A N D L I N G
 ;;======================================================================
 
 (define (common:run-sync?)

Index: commonmod.scm
==================================================================
--- commonmod.scm
+++ commonmod.scm
@@ -23,16 +23,19 @@
 
 (module commonmod
 	*
 	
 (import scheme chicken data-structures extras)
+	
 (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18
 	srfi-1 files format srfi-13 matchable 
 	srfi-69 ports
 	regex-case regex hostinfo srfi-4
 	pkts (prefix dbi dbi:)
-	stack)
+	stack
+	md5
+	message-digest)
 
 ;; (import processmod)
 (import stml2)
 
 (include "common_records.scm")
@@ -1481,6 +1484,12 @@
 ;; if a value is printable (i.e. string or number) return the value
 ;; else return an empty string
 (define-inline (printable val)
   (if (or (number? val)(string? val)) val ""))
 
+(define (common:get-area-path-signature)
+  (message-digest-string (md5-primitive) *toppath*))
+
+(define (common:get-signature str)
+  (message-digest-string (md5-primitive) str))
+
 )

Index: megamod.scm
==================================================================
--- megamod.scm
+++ megamod.scm
@@ -166,29 +166,29 @@
 			    (print-call-chain)
 			    (print " message: " ((condition-property-accessor 'exn 'message) exn)))
 			(common:watchdog)))
 		    "Watchdog thread"))
 
-(include "api-inc.scm")
-(include "archive-inc.scm")
+(include "api-inc.scm")       ;; L3 
+(include "archive-inc.scm")  
 (include "client-inc.scm")
-(include "common-inc.scm")
-(include "db-inc.scm")
+(include "common-inc.scm")    ;; L5
+(include "db-inc.scm")        ;; L4
 (include "env-inc.scm")
 (include "http-transport-inc.scm")
 (include "items-inc.scm")
 (include "keys-inc.scm")
-(include "launch-inc.scm")
+(include "launch-inc.scm")     ;; L1
 (include "margs-inc.scm")
 (include "mt-inc.scm")
-(include "ods-inc.scm")
+(include "ods-inc.scm")        ;; L1
 (include "pgdb-inc.scm")
 (include "portlogger-inc.scm")
-(include "process-inc.scm")
-(include "rmt-inc.scm")
+(include "process-inc.scm")    ;; L6
+(include "rmt-inc.scm")        ;; L2
 (include "runconfig-inc.scm")
-(include "runs-inc.scm")
+(include "runs-inc.scm")       ;; L1.5
 (include "server-inc.scm")
 (include "subrun-inc.scm")
 (include "tasks-inc.scm")
 (include "tdb-inc.scm")
 (include "tests-inc.scm")

Index: tasksmod.scm
==================================================================
--- tasksmod.scm
+++ tasksmod.scm
@@ -29,7 +29,9 @@
 (import commonmod)
 ;; (use (prefix ulex ulex:))
 
 (include "common_records.scm")
 (include "task_records.scm")
+
+;; (include "tasks-inc.scm")
 
 )