@@ -16,29 +16,30 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
 (declare (unit server))
 
-(declare (uses common))
+;; (declare (uses common))
 (declare (uses debugprint))
 (declare (uses commonmod))
 (declare (uses configfmod))
 (declare (uses rmtmod))
-(declare (uses launch))
+(declare (uses launchmod))
 (declare (uses mtargs))
 
 (use (srfi 18) extras s11n)
 (use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
 (use directory-utils posix-extras matchable utils)
 (use spiffy uri-common intarweb http-client spiffy-request-vars)
 
 (import commonmod
 	configfmod
+	launchmod
 	debugprint
 	(prefix mtargs args:))
 
-(include "common_records.scm")
+;; (include "common_records.scm")
 ;; (include "db_records.scm")
 
 (define (db:kill-servers)
   (let* ((tl (launch:setup)) ;; need this to initialize *toppath*
         (servdir (conc *toppath* "/.servinfo"))