@@ -14,56 +14,76 @@
 ;; 
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 
-;; (include "common.scm")
-(include "megatest-version.scm")
+(use (prefix sqlite3 sqlite3:)
+     srfi-1 posix regex regex-case
+     srfi-69 (prefix base64 base64:) apropos json http-client
+     directory-utils typed-records http-client srfi-18 extras format
+     sparse-vectors)
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
+(use readline)
 
-(declare (uses common))
-;; (declare (uses megatest-version))
 (declare (uses margsmod))
 (import margsmod)
-
-(declare (uses runs))
-(declare (uses launch))
-(declare (uses server))
-
-(declare (uses tests))
-(declare (uses genexample))
-(declare (uses db))
-
-(declare (uses tdb))
-(declare (uses mt))
+(declare (uses margsmod.import))
+
+(declare (uses debugprint))
+(import debugprint)
+(declare (uses debugprint.import))
+
+(declare (uses configfmod))
+(import configfmod)
+(declare (uses configfmod.import))
+
+(declare (uses commonmod))
+(import commonmod)
+(declare (uses commonmod.import))
+
+(declare (uses items))
+(import items)
+(declare (uses items.import))
+
+(declare (uses ods))
+(import ods)
+(declare (uses ods.import))
+
+(declare (uses dbmod))
+(import dbmod)
+(declare (uses dbmod.import))
+
+(declare (uses pgdb))
+(import pgdb)
+(declare (uses pgdb.import))
 
 (declare (uses tasks)) ;; only used for debugging.
 (import tasks)
 (declare (uses tasks.import))
 
-(declare (uses env))
-(declare (uses diff-report))
+(declare (uses apimod))
+(import apimod)
+(declare (uses apimod.import))
 
-;; Needed for repl even if not used here in megatest.scm
-;; ORDER MATTERS!
+(declare (uses portlogger))
+(import portlogger)
+(declare (uses portlogger.import))
+
+(declare (uses tdb))
+(import tdb)
+(declare (uses tdb.import))
+
+(declare (uses rmtmod))
+(import rmtmod)
+(declare (uses rmtmod.import))
 
 (declare (uses client))
 (import client)
 (declare (uses client.import))
 
-(declare (uses commonmod))
-(declare (uses debugprint))
-(import commonmod)
-(import debugprint)
-(declare (uses commonmod.import))
-
-(declare (uses configfmod))
-(import configfmod)
-(declare (uses configfmod.import))
-
 (declare (uses ods))
 (import ods)
 (declare (uses ods.import))
 
 (declare (uses dbmod))
@@ -72,34 +92,43 @@
 
 (declare (uses servermod))
 (import servermod)
 (declare (uses servermod.import))
 
-(declare (uses apimod))
-(import apimod)
-(declare (uses apimod.import))
 
-(declare (uses rmtmod))
-(import rmtmod)
-(declare (uses rmtmod.import))
+;; (include "common.scm")
+(include "megatest-version.scm")
+
+(declare (uses common))
+;; (declare (uses megatest-version))
+
+(declare (uses runs))
+(declare (uses launch))
+(declare (uses server))
+
+(declare (uses tests))
+(declare (uses genexample))
+(declare (uses db))
+
+(declare (uses tdb))
+(declare (uses mt))
+
+(declare (uses env))
+(declare (uses diff-report))
+
+;; Needed for repl even if not used here in megatest.scm
+;; ORDER MATTERS!
+
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "megatest-fossil-hash.scm")
 
-(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (prefix base64 base64:)
-     readline apropos json http-client directory-utils typed-records
-     http-client srfi-18 extras format)
-
-;; Added for csv stuff - will be removed
-;;
-(use sparse-vectors)
-
 (require-library mutils)
 
 (define *usage-log-file* #f)    ;; put path to file for logging usage in this var in the ~/.megatestrc file
 (define *usage-use-seconds* #t) ;; for Epoc seconds in usage logging change this to #t in ~/.megatestrc file