Index: common_records.scm
==================================================================
--- common_records.scm
+++ common_records.scm
@@ -17,8 +17,8 @@
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;======================================================================
 
 ;; (use trace)
-(use typed-records)
+(import typed-records)
 
 ;; moved to commonmod

Index: itemsmod.scm
==================================================================
--- itemsmod.scm
+++ itemsmod.scm
@@ -23,12 +23,12 @@
 (declare (uses mtconfigf))
 
 (module itemsmod
 	*
 	
-(import scheme chicken data-structures extras)
-(use (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69 format ports srfi-1 matchable)
+(import scheme (chicken base))
+(import (prefix sqlite3 sqlite3:) typed-records srfi-18 srfi-69 format (chicken port) srfi-1 matchable)
 (import commonmod)
 (import(prefix mtconfigf configf:))
 ;; (use (prefix ulex ulex:))
 
 ;; (include "common_records.scm")

Index: mtconfigf/mtconfigf.scm
==================================================================
--- mtconfigf/mtconfigf.scm
+++ mtconfigf/mtconfigf.scm
@@ -71,14 +71,14 @@
 	 ;; misc
 	 realpath
 	 find-chicken-lib
          )
 
-(import scheme chicken data-structures extras ports files)
-(use posix typed-records srfi-18 pathname-expand posix-extras)
-(use regex regex-case srfi-69 srfi-1 directory-utils extras srfi-13 )
-(use srfi-69)
+(import scheme (chicken base) (chicken string) (chicken file) (chicken port))
+(import typed-records srfi-18 pathname-expand posix-extras)
+(import regex regex-case srfi-69 srfi-1 directory-utils extras srfi-13 )
+(import srfi-69)
 (import posix)
 
 ;; stub debug printers overridden by set-debug-printers
 (define (debug:print n e . args)
   (apply print args))

Index: odsmod.scm
==================================================================
--- odsmod.scm
+++ odsmod.scm
@@ -22,11 +22,11 @@
 (declare (uses commonmod))
 
 (module odsmod
 	*
 	
-(import scheme chicken data-structures extras csv-xml regex)
+(import scheme (chicken base) (chicken string) (chicken port) (chicken io) (chicken file) csv-xml regex)
 (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69
 	format ports srfi-1 matchable srfi-13)
 (import commonmod)
 ;; (use (prefix ulex ulex:))
 

Index: pkts/pkts.scm
==================================================================
--- pkts/pkts.scm
+++ pkts/pkts.scm
@@ -162,12 +162,13 @@
 ;; utility procs
 increment-string ;; used to get indexes for strings in ref pkts
 make-report      ;; make a .dot file 
 )
 
-(import chicken scheme data-structures posix srfi-1 regex srfi-13 srfi-69 ports extras)
-(use crypt sha1 message-digest (prefix dbi dbi:) typed-records)
+(import (chicken base) scheme (chicken process) (chicken time posix) (chicken io) (chicken file))
+(import chicken.process-context.posix (chicken string) (chicken time) (chicken sort) (chicken file posix) (chicken condition) srfi-1 regex srfi-13 srfi-69 (chicken port) )
+(import crypt sha1 message-digest (prefix dbi dbi:) typed-records)
 
 ;;======================================================================
 ;; DATA MANIPULATION UTILS
 ;;======================================================================
 

Index: stml2/cookie.scm
==================================================================
--- stml2/cookie.scm
+++ stml2/cookie.scm
@@ -45,11 +45,11 @@
 ;; (declare (unit cookie))
 
 (module cookie
     *
 
-(import chicken scheme data-structures extras srfi-13 ports posix)
+(import (chicken base) scheme queues srfi-13 (chicken port) (chicken io)(chicken file) (chicken format) (chicken string) (chicken time posix))
   
 (require-extension srfi-1 srfi-13 srfi-14 regex)
 ;; (use  srfi-1 srfi-13 srfi-14 regex)
 ;; (declare (export parse-cookie-string construct-cookie-string))
 

Index: stml2/stml2.scm
==================================================================
--- stml2/stml2.scm
+++ stml2/stml2.scm
@@ -12,14 +12,14 @@
 ;; (declare (unit stml))
 
 (module stml2
     *
 
-(import chicken scheme data-structures extras srfi-13 ports posix srfi-69 files srfi-1) 
+(import (chicken base) scheme queues srfi-13 (chicken port) (chicken io) (chicken file) srfi-69 srfi-1 (chicken condition)) 
 
 (import cookie)
-(use (prefix dbi dbi:) (prefix crypt c:) typed-records)
+(import (prefix dbi dbi:) (prefix crypt c:) typed-records)
 
 ;; (declare (uses misc-stml))
 (use regex)
 
 ;; The (usually global) sdat contains everything about the session

Index: ulex/ulex.scm
==================================================================
--- ulex/ulex.scm
+++ ulex/ulex.scm
@@ -58,12 +58,12 @@
      ;;     ;; system
      ;;     get-normalized-cpu-load
 	 
      ;; )
 
-(import scheme posix chicken data-structures ports extras files mailbox)
-(import rpc srfi-18 pkts matchable regex
+(import scheme posix-groups (chicken base) queues (chicken port) (chicken io) (chicken file) mailbox)
+(import srfi-18 pkts matchable regex
 	typed-records srfi-69 srfi-1
 	srfi-4 regex-case
 	(prefix sqlite3 sqlite3:)
 	foreign
 	tcp) ;; ulex-netutil)