@@ -16,56 +16,77 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;======================================================================
 
-(use format)
+(import format)
 
 (declare (uses ducttape-lib))
-(require-library iup)
+(declare (uses bigmod))
+(declare (uses debugprint))
+
 (import (prefix iup iup:))
-
 (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:))
+
+(import ducttape-lib
+	bigmod)
+
+(import (prefix sqlite3 sqlite3:)
+	srfi-1
+	chicken.file.posix
+	chicken.string
+	chicken.process-context
+	regex regex-case srfi-69
+	typed-records
+	sparse-vectors)
 
 (declare (uses commonmod))
-(declare (uses mtargs))
-;; (declare (uses keys))
-(declare (uses itemsmod))
+(declare (uses configfmod))
+(declare (uses dashboard-context-menu))
+(declare (uses dashboard-guimonitor))
+(declare (uses dashboard-tests))
 (declare (uses dbmod))
-(declare (uses configfmod))
-(declare (uses process))
-(declare (uses launch))
-(declare (uses runs))
-(declare (uses dashboard-tests))
-(declare (uses dashboard-guimonitor))
+(declare (uses dcommon))
+(declare (uses itemsmod))
+(declare (uses launchmod))
+(declare (uses mtmod))
+(declare (uses mtargs))
+(declare (uses mtver))
+(declare (uses processmod))
+(declare (uses runsmod))
+(declare (uses subrunmod))
 (declare (uses tree))
-(declare (uses dcommon))
-(declare (uses dashboard-context-menu))
-(declare (uses vg))
-(declare (uses subrun))
+(declare (uses vgmod))
+(declare (uses bigmod.import))
+(declare (uses debugprint.import))
 ;; (declare (uses dashboard-main))
-(declare (uses mt))
-(declare (uses mtver))
 
-(include "common_records.scm")
+;; (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")
 ;; (include "megatest-version.scm")
 (include "megatest-fossil-hash.scm")
 (include "vg_records.scm")
 
-(import commonmod
-	mtargs
-	itemsmod
-	dbmod
-	configfmod
-	)
+(import
+ commonmod
+ configfmod
+ dbmod
+ debugprint
+ itemsmod
+ launchmod
+ (prefix mtargs args:)
+ mtmod
+ mtver
+ processmod
+ runsmod
+ subrunmod
+ vgmod
+ )
 
 (define help (conc 
 	      "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
   license GPL, Copyright (C) Matt Welland 2012-2017