@@ -5,12 +5,20 @@
 ;; 
 ;;  This program is distributed WITHOUT ANY WARRANTY; without even the
 ;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 ;;  PURPOSE.
 
-(include "common.scm")
-(include "megatest-version.scm")
+;; (include "common.scm")
+;; (include "megatest-version.scm")
+
+(declare (uses common))
+(declare (uses megatest-version))
+(declare (uses margs))
+(declare (uses runs))
+(declare (uses launch))
+
+(include "common_records.scm")
 
 (define help (conc "
 Megatest, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
   license GPL, Copyright Matt Welland 2006-2011
@@ -152,20 +160,10 @@
 (if (args:get-arg "-h")
     (begin
       (print help)
       (exit)))
 
-(include "keys.scm")
-(include "items.scm")
-(include "db.scm")
-(include "configf.scm")
-(include "process.scm")
-(include "launch.scm")
-(include "runs.scm")
-(include "runconfig.scm")
-(include "ods.scm")
-
 (define *didsomething* #f)
 
 ;;======================================================================
 ;; Misc setup stuff
 ;;======================================================================