@@ -13,27 +13,35 @@
 ;;     GNU General Public License for more details.
 ;; 
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
+
+(declare (uses common))
+(declare (uses margs))
+(declare (uses configf))
+(declare (uses pkts))
+;; (declare (uses rmt))
 
 ;; (include "common.scm")
 (include "megatest-version.scm")
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
-(use srfi-1 posix srfi-69 readline ;;  regex regex-case srfi-69 apropos json http-client directory-utils rpc typed-records;; (srfi 18) extras)
-   srfi-19  srfi-18 extras format pkts regex regex-case
-     (prefix dbi dbi:)
-     (prefix sqlite3 sqlite3:)
-     nanomsg)
-
-(declare (uses common))
-(declare (uses margs))
-(declare (uses configf))
-;; (declare (uses rmt))
+(import
+ srfi-1
+ ;; posix
+ srfi-69 breadline ;;  regex regex-case srfi-69 apropos json http-client directory-utils rpc typed-records;; (srfi 18) extras)
+ srfi-19  srfi-18
+ ;; extras
+ chicken.format
+ pkts regex regex-case
+ (prefix dbi dbi:)
+ (prefix sqlite3 sqlite3:)
+ nanomsg)
+
 
 (use ducttape-lib)
 
 (include "megatest-fossil-hash.scm")
 
@@ -1951,13 +1959,13 @@
       (exit)))
 
 (if (or (args:get-arg "-repl")
 	(args:get-arg "-load"))
     (begin
-      (import extras) ;; might not be needed
+      ;; (import extras) ;; might not be needed
       ;; (import csi)
-      (import readline)
+      (import breadline)
       (import apropos)
       ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
       
       (install-history-file (get-environment-variable "HOME") ".mtutil_history") ;;  [homedir] [filename] [nlines])
       (current-input-port (make-readline-port "mtutil> "))