@@ -19,17 +19,22 @@
  
 ;;======================================================================
 ;; Run keys, these are used to hierarchially organise tests and run areas
 ;;======================================================================
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69)
-(import (prefix sqlite3 sqlite3:))
-
 (declare (unit keys))
 (declare (uses common))
+(declare (uses debugprint))
 (declare (uses commonmod))
-(import commonmod)
+(declare (uses mtargs))
+
+(use sqlite3 srfi-1 posix regex regex-case srfi-69)
+(import (prefix sqlite3 sqlite3:)
+	(prefix mtargs args:))
+
+(import commonmod
+	debugprint)
 
 (include "key_records.scm")
 (include "common_records.scm")
 
 (define (keys->keystr keys) ;; => key1,key2,key3,additiona1, ...