@@ -16,24 +16,12 @@
 ;;     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)
-
-(require-library iup)
-(import (prefix iup iup:))
-
-(use canvas-draw)
-(import canvas-draw-iup)
-(use ducttape-lib)
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors) ;; defstruct
-(import (prefix sqlite3 sqlite3:))
-(import dbfile)
-
 (declare (uses common))
-(declare (uses margs))
+(declare (uses mtargs))
 (declare (uses keys))
 (declare (uses items))
 (declare (uses db))
 (declare (uses configf))
 (declare (uses process))
@@ -49,13 +37,27 @@
 (declare (uses dbmod))
 ;; (declare (uses dbmemmod))
 (declare (uses dbfile))
 (declare (uses commonmod))
 (declare (uses commonmod.import))
-(import commonmod)
 
-(import dbmod dbfile)
+(use format)
+
+(require-library iup)
+(import (prefix iup iup:))
+
+(use canvas-draw)
+(import canvas-draw-iup
+	(prefix sqlite3 sqlite3:))
+
+(use ducttape-lib)
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors) ;; defstruct
+
+(import commonmod
+	(prefix mtargs args:)
+	dbmod
+	dbfile)
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "task_records.scm")