@@ -20,32 +20,43 @@
 
 ;;======================================================================
 ;; Test info panel
 ;;======================================================================
 
-(use format fmt)
-(require-library iup)
+(import format fmt)
 (import (prefix iup iup:))
 
-(use canvas-draw)
+(import canvas-draw)
 
-(use srfi-1 posix regex regex-case srfi-69)
-(use (prefix sqlite3 sqlite3:))
+(import srfi-1
+	chicken.file.posix
+	regex regex-case srfi-69
+	(prefix sqlite3 sqlite3:))
 
 (declare (unit dashboard-tests))
-(declare (uses common))
-(declare (uses db))
+(declare (uses commonmod))
+(declare (uses dbmod))
 (declare (uses gutils))
-(declare (uses rmt))
-(declare (uses ezsteps))
+(declare (uses rmtmod))
+(declare (uses ezstepsmod))
 ;; (declare (uses sdb))
 ;; (declare (uses filedb))
-(declare (uses subrun))
+(declare (uses subrunmod))
+(declare (uses debugprint))
 
-(include "common_records.scm")
+;; (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
+
+(import
+ commonmod
+ dbmod
+ rmtmod
+ ezstepsmod
+ subrunmod
+ debugprint
+ )
 
 ;;======================================================================
 ;; C O M M O N
 ;;======================================================================