Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -42,10 +42,11 @@
 (declare (uses subrunmod))
 (declare (uses tree))
 (declare (uses vgmod))
 (declare (uses testsmod))
 (declare (uses tasksmod))
+(declare (uses dbi))
 
 ;; needed for configf scripts, scheme etc.
 ;; (declare (uses apimod.import))
 ;; (declare (uses debugprint.import))
 ;; (declare (uses mtargs.import))
@@ -89,10 +90,11 @@
 
 	(prefix iup iup:)
 	canvas-draw
 	canvas-draw-iup
 	(prefix sqlite3 sqlite3:)
+	(prefix dbi dbi:)
 	srfi-1
 	regex regex-case srfi-69
 	typed-records
 	sparse-vectors
 	format

Index: dbi.scm
==================================================================
--- dbi.scm
+++ dbi.scm
@@ -17,7 +17,8 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;======================================================================
 
 (declare (unit dbi))
+(declare (uses autoload))
 
 (include "dbi/dbi.scm")

Index: stml2.scm
==================================================================
--- stml2.scm
+++ stml2.scm
@@ -18,8 +18,10 @@
 
 ;;======================================================================
 
 (declare (unit stml2))
 (declare (uses cookie))
+(declare (uses dbi))
+(declare (uses autoload))
 
 (include "stml2/stml2.scm")
 

Index: stml2/formdat.scm
==================================================================
--- stml2/formdat.scm
+++ stml2/formdat.scm
@@ -10,12 +10,11 @@
 ;; (declare (unit formdat))
 
 (module formdat
     *
 
-(import chicken scheme data-structures extras srfi-13 ports )
-(use html-filter)
+(import chicken scheme data-structures extras srfi-13 ports html-filter)
 
-(use regex)
-(require-extension srfi-69)
+(import regex)
+(import srfi-69)
 
 )

Index: stml2/html-filter.scm
==================================================================
--- stml2/html-filter.scm
+++ stml2/html-filter.scm
@@ -11,11 +11,11 @@
 
 (module html-filter
     *
 
 (import chicken scheme data-structures extras srfi-13 ports )
-(use misc-stml)
+(import misc-stml)
 
-(require-extension regex)
+(import regex)
 
 ;; 
 )

Index: stml2/misc-stml.scm
==================================================================
--- stml2/misc-stml.scm
+++ stml2/misc-stml.scm
@@ -16,9 +16,8 @@
 (module misc-stml
   *
 
 (import chicken scheme data-structures extras srfi-13 ports posix)
   
-(use regex (prefix dbi dbi:))
-(use (prefix crypt c:))
-(use (prefix dbi dbi:))
+(import regex (prefix dbi dbi:))
+(import (prefix crypt c:))
 )

Index: stml2/rollup-pages.scm
==================================================================
--- stml2/rollup-pages.scm
+++ stml2/rollup-pages.scm
@@ -1,6 +1,6 @@
-(use regex posix srfi-69 srfi-1)
+(import regex posix srfi-69 srfi-1)
 
 (define extract-rx (regexp "pages\\/(.*)_(view|ctrl).scm"))
 
 (define (print-page-wrapper lookup page)
   (print "(define (pages:" page " session db shared)")

Index: stml2/session.scm
==================================================================
--- stml2/session.scm
+++ stml2/session.scm
@@ -11,10 +11,9 @@
 (module session
     *
   
 (import chicken scheme data-structures extras srfi-13 ports posix files srfi-1)
 
-(use (prefix dbi dbi:) srfi-69)
-(require-extension regex)
-(use cookie stmlcommon) ;; (declare (uses cookie))
+(import (prefix dbi dbi:) srfi-69 regex)
+(import cookie stmlcommon) ;; (declare (uses cookie))
 
 )

Index: stml2/setup.scm
==================================================================
--- stml2/setup.scm
+++ stml2/setup.scm
@@ -9,13 +9,12 @@
 
 (module setup
     *
 (import chicken scheme data-structures extras srfi-13 ports posix)
 
-(uses session misc-stml)
+(import session misc-stml)
 ;; (declare (unit setup))se
 ;; (declare (uses session))
-(require-extension srfi-69)
-(require-extension regex)
+(import srfi-69 regex)
 
 
 )

Index: stml2/spiffyserver.scm
==================================================================
--- stml2/spiffyserver.scm
+++ stml2/spiffyserver.scm
@@ -1,8 +1,8 @@
 ;; This doesn't work yet
 ;;
-(use spiffy cgi-handler)
+(import spiffy cgi-handler)
 
 (spiffy-debug-mode #t)
 
 (spiffy-file-ext-handlers 
  `(("drcdb" . ,(cgi-handler* "/path/to/drcdb"))))

Index: stml2/sqlite3.scm
==================================================================
--- stml2/sqlite3.scm
+++ stml2/sqlite3.scm
@@ -9,11 +9,11 @@
 ;;
 
 ;; I used this to get a simple interactive sqlite editor on the nokia n800
 ;; since I couldn't get sqlite3 to install (for reasons I can't remember).
 
-(use sqlite3)
+(import sqlite3)
 
 (define args (argv))
 (define num-args (length args))
 
 (define dbname #f)

Index: stml2/stmlcommon.scm
==================================================================
--- stml2/stmlcommon.scm
+++ stml2/stmlcommon.scm
@@ -13,8 +13,8 @@
 (module stmlcommon
     *
 
 (import  chicken scheme data-structures extras srfi-13 ports posix)
 
-(use (prefix dbi dbi:) regex (prefix crypt c:) srfi-69)
+(import (prefix dbi dbi:) regex (prefix crypt c:) srfi-69)
 
 )

Index: stml2/stmlrun.scm
==================================================================
--- stml2/stmlrun.scm
+++ stml2/stmlrun.scm
@@ -11,9 +11,9 @@
 
 ;; (require-extension syntax-case)
 ;; (declare (run-time-macros))
 
 ;; (include "stmlcommon.scm")
-(require-library stml)
+(import stml)
 
 
 (stml:main #f)

Index: stml2/test.scm
==================================================================
--- stml2/test.scm
+++ stml2/test.scm
@@ -1,8 +1,7 @@
-(use test md5)
+(import test md5)
 
-(require-extension sqlite3)
 (import (prefix sqlite3 sqlite3:))
 
 (require-library dbi)
 
 ;; (declare (uses stml))

Index: testsmod.scm
==================================================================
--- testsmod.scm
+++ testsmod.scm
@@ -26,10 +26,11 @@
 (declare (uses itemsmod))
 (declare (uses rmtmod))
 (declare (uses stml2))
 (declare (uses dbmod))
 (declare (uses tasksmod))
+(declare (uses dbi))
 
 (module testsmod
 	*
 	
 (import scheme