@@ -20,29 +20,38 @@
 
 ;;======================================================================
 ;; Test info panel
 ;;======================================================================
 
-(use format)
-(require-library iup)
+(import format)
 (import (prefix iup iup:))
-
-(use canvas-draw)
+(import canvas-draw)
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69)
-(import (prefix sqlite3 sqlite3:))
+(import
+ srfi-1
+ chicken.file.posix regex regex-case srfi-69
+ (prefix sqlite3 sqlite3:))
 
 (declare (unit dashboard-guimonitor))
-(declare (uses common))
-(declare (uses keys))
-(declare (uses db))
-(declare (uses tasks))
+(declare (uses commonmod))
+(declare (uses keysmod))
+(declare (uses dbmod))
+(declare (uses tasksmod))
+(declare (uses debugprint))
 
-(include "common_records.scm")
+;; (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")
+
+(import
+ commonmod
+ keysmod
+ dbmod
+ tasksmod
+ debugprint
+ )
 
 (define (control-panel db tdb keys)
   (let* ((var-params (make-hash-table)) ;; register all the widgets here for querying on run, rollup, remove?
 	 (key-params (make-hash-table))
 	 (monitordat '()) ;; list of monitor records