--- gforth/startup.fs	2005/01/06 21:31:51	1.55
+++ gforth/startup.fs	2005/12/31 15:46:10	1.60
@@ -1,6 +1,6 @@
 \ startup file
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -31,8 +31,10 @@ include envos.fs
 include errors.fs
 include extend.fs              \ load core-extended
 include hash.fs
-require xchars.fs
 
+[ifundef] xemit
+    require kernel/xchars.fs
+[then]
 \ require interpretation.fs
 \ include float.fs
 \ include search.fs
@@ -44,7 +46,7 @@ include wordinfo.fs
 include vt100.fs
 \ include colorize.fs
 include bufio.fs
-\ require utf-8.fs
+require utf-8.fs
 include history.fs
 s" os-class" environment? dup [IF] drop s" unix" str= [THEN]
 [IF]
@@ -99,6 +101,9 @@ true constant search-order
 true constant search-order-ext
 true constant string
 true constant string-ext
+\ extension queries
+' noop alias X:deferred
+' noop alias X:extension-query
 set-current
 
 warnings on