@@ -20,13 +20,13 @@
 ;; (include "megatest-version.scm")
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
-(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 tcp6)
+(import (prefix sqlite3 sqlite3:) srfi-1 regex regex-case srfi-69 (prefix base64 base64:)
+     breadline apropos json http-client directory-utils typed-records
+     http-client srfi-18 chicken.format tcp6)
 
 ;; Added for csv stuff - will be removed
 ;;
 (use sparse-vectors)
 
@@ -2363,13 +2363,12 @@
 
 	    (repl))
 	   (else
 	    (begin
 	      (set! *db* dbstruct)
-	      (import extras) ;; might not be needed
 	      ;; (import csi)
-	      (import readline)
+	      (import breadline)
 	      (import apropos)
 	      (import dbmod)
 	      (import rmtmod)
 	      (import commonmod)
 	      ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...