@@ -25,25 +25,26 @@
 (use regex regex-case) ;;  directory-utils)
 (declare (unit configf))
 (declare (uses process))
 (declare (uses env))
 (declare (uses keys))
+(declare (uses common))
 
 (include "common_records.scm")
 
 ;; return list (path fullpath configname)
 (define (find-config configname #!key (toppath #f))
   (if toppath
       (let ((cfname (conc toppath "/" configname)))
-	(if (common:file-exists? cfname)
+	(if (file-exists? cfname)
 	    (list toppath cfname configname)
 	    (list #f      #f     #f)))
       (let* ((cwd (string-split (current-directory) "/")))
 	(let loop ((dir cwd))
 	  (let* ((path     (conc "/" (string-intersperse dir "/")))
 		 (fullpath (conc path "/" configname)))
-	    (if (common:file-exists? fullpath)
+	    (if (file-exists? fullpath)
 		(list path fullpath configname)
 		(let ((remcwd (take dir (- (length dir) 1))))
 		  (if (null? remcwd)
 		      (list #f #f #f) ;;  #f #f) 
 		  (loop remcwd)))))))))
@@ -304,11 +305,11 @@
 ;;       				  ((port?   path) "port")
 ;;       				  (else (conc path))))
 ;;                        (T      . configf))
 ;;       	       *configdat* #t add-only: #t))
   (if (and (not (port? path))
-	   (not (common:file-exists? path))) ;; for case where we are handed a port
+	   (not (file-exists? path))) ;; for case where we are handed a port
       (begin 
 	(debug:print-info 1 *default-log-port* "read-config - file not found " path " current path: " (current-directory))
 	;; WARNING: This is a risky change but really, we should not return an empty hash table if no file read?
 	#f) ;; (if (not ht)(make-hash-table) ht))
       (let ((inp        (if (string? path)
@@ -365,11 +366,11 @@
                                                              (common:nice-path 
                                                               (conc (if curr-conf-dir
                                                                         curr-conf-dir
                                                                         ".")
                                                                     "/" include-file)))))
-                                     (if (common:file-exists? full-conf)
+                                     (if (file-exists? full-conf)
                                          (begin
                                            ;; (push-directory conf-dir)
                                            (debug:print 9 *default-log-port* "Including: " full-conf)
                                            (read-config full-conf res allow-system environ-patt: environ-patt
                                                         curr-section: curr-section-name sections: sections settings: settings
@@ -384,11 +385,11 @@
 	       (configf:script-rx ( x include-script params);; handle-exceptions
                                   ;;    exn
                                   ;;    (begin
                                   ;;      (debug:print '(0 2 9) #f "INFO: include from script " include-script " failed.")
                                   ;;      (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))
-                                  (if (and (common:file-exists? include-script)(file-execute-access? include-script))
+                                  (if (and (file-exists? include-script)(file-execute-access? include-script))
                                       (let* ((local-allow-system  (calc-allow-system allow-system curr-section-name sections))
                                              (env-delta  (configf:cfgdat->env-alist curr-section-name res local-allow-system))
                                              (new-inp-port
                                               (common:with-env-vars
                                                env-delta
@@ -630,11 +631,11 @@
 	  (if (null? tal)
 	      newres
 	      (loop (car tal)(cdr tal) newres))))))
 
 (define (configf:file->list fname)
-  (if (common:file-exists? fname)
+  (if (file-exists? fname)
       (let ((inp (open-input-file fname)))
 	(let loop ((inl (read-line inp))
 		   (res '()))
 	  (if (eof-object? inl)
 	      (begin
@@ -734,11 +735,11 @@
 
 ;; reads a refdb into an assoc array of assoc arrays
 ;;   returns (list dat msg)
 (define (configf:read-refdb refdb-path)
   (let ((sheets-file  (conc refdb-path "/sheet-names.cfg")))
-    (if (not (common:file-exists? sheets-file))
+    (if (not (file-exists? sheets-file))
 	(list #f (conc "ERROR: no refdb found at " refdb-path))
 	(if (not (file-read-access? sheets-file))
 	    (list #f (conc "ERROR: refdb file not readable at " refdb-path))
 	    (let* ((sheets (with-input-from-file sheets-file
 			     (lambda ()
@@ -815,11 +816,11 @@
           (begin
             (with-output-to-file fname ;; first write out the file
               (lambda ()
                 (pp dat)))
             
-            (if (common:file-exists? fname)   ;; now verify it is readable
+            (if (file-exists? fname)   ;; now verify it is readable
                 (if (configf:read-alist fname)
                     #t ;; data is good.
                     (begin
                       (handle-exceptions
                        exn