@@ -18,25 +18,26 @@
 ;;
 ;;======================================================================
 
 (use format)
 
+(declare (uses ducttape-lib))
 (require-library iup)
 (import (prefix iup iup:))
 
-(use canvas-draw)
-(import canvas-draw-iup)
-(use ducttape-lib)
+(import canvas-draw)
+;; (import canvas-draw-iup)
+(import ducttape-lib)
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors) ;; defstruct
 (import (prefix sqlite3 sqlite3:))
 
-(declare (uses common))
-(declare (uses margs))
-(declare (uses keys))
-(declare (uses items))
-(declare (uses db))
-(declare (uses configf))
+(declare (uses commonmod))
+(declare (uses mtargs))
+;; (declare (uses keys))
+(declare (uses itemsmod))
+(declare (uses dbmod))
+(declare (uses configfmod))
 (declare (uses process))
 (declare (uses launch))
 (declare (uses runs))
 (declare (uses dashboard-tests))
 (declare (uses dashboard-guimonitor))
@@ -45,18 +46,26 @@
 (declare (uses dashboard-context-menu))
 (declare (uses vg))
 (declare (uses subrun))
 ;; (declare (uses dashboard-main))
 (declare (uses mt))
+(declare (uses mtver))
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")
-(include "megatest-version.scm")
+;; (include "megatest-version.scm")
 (include "megatest-fossil-hash.scm")
 (include "vg_records.scm")
+
+(import commonmod
+	mtargs
+	itemsmod
+	dbmod
+	configfmod
+	)
 
 (define help (conc 
 	      "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
   license GPL, Copyright (C) Matt Welland 2012-2017