@@ -16,31 +16,35 @@
 ;;     You should have received a copy of the GNU General Public License
 ;;     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
 ;;
 ;;======================================================================
 
-(use format)
-(require-library iup)
+(import format)
+(import iup)
 (import (prefix iup iup:))
 (import canvas-draw)
-;; (import canvas-draw-iup)
-(use regex typed-records matchable)
+
+(import regex typed-records matchable srfi-69)
 
 (declare (unit dcommon))
 
 (declare (uses gutils))
-(declare (uses db))
+(declare (uses dbmod))
 (declare (uses mtver))
-;; (declare (uses synchash))
+(declare (uses debugprint))
 
 ;; (include "megatest-version.scm")
-(include "common_records.scm")
+;; (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
 (include "run_records.scm")
 
-(import mtver)
+(import
+ mtver
+ dbmod
+ debugprint
+ )
 
 ;; yes, this is non-ideal 
 (define dashboard:update-summary-tab #f)
 (define dashboard:update-servers-table #f)