@@ -28,11 +28,11 @@
 (import margsmod)
 
 (declare (uses runs))
 (declare (uses launch))
 (declare (uses server))
-(declare (uses client))
+
 (declare (uses tests))
 (declare (uses genexample))
 (declare (uses db))
 
 (declare (uses tdb))
@@ -46,12 +46,18 @@
 (declare (uses diff-report))
 
 ;; Needed for repl even if not used here in megatest.scm
 ;; ORDER MATTERS!
 
+(declare (uses client))
+(import client)
+(declare (uses client.import))
+
 (declare (uses commonmod))
+(declare (uses debugprint))
 (import commonmod)
+(import debugprint)
 (declare (uses commonmod.import))
 
 (declare (uses configfmod))
 (import configfmod)
 (declare (uses configfmod.import))
@@ -524,21 +530,11 @@
 (let ((targ (or (args:get-arg "-reqtarg")(args:get-arg "-target"))))
   (if targ (setenv "MT_TARGET" targ)))
 
 ;; The watchdog is to keep an eye on things like db sync etc.
 ;;
-
-;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
-(define *watchdog* (make-thread
-		    (lambda ()
-		      (handle-exceptions
-			  exn
-			  (begin
-			    (print-call-chain)
-			    (print " message: " ((condition-property-accessor 'exn 'message) exn) ", exn=" exn))
-			(common:watchdog)))
-		    "Watchdog thread"))
+;; moved to commonmod
 
 ;;(if (not (args:get-arg "-server"))
 ;;    (thread-start! *watchdog*)) ;; if starting a server; wait till we get to running state before kicking off watchdog
 (let* ((no-watchdog-args
        '("-list-runs"