--- gforth/startup.fs	1995/11/24 18:05:36	1.13
+++ gforth/startup.fs	1997/07/06 15:55:25	1.23
@@ -19,27 +19,32 @@
 \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 warnings off
+include search.fs
+include environ.fs
+include errors.fs
+include extend.fs              \ load core-extended
+include hash.fs
 
+\ require interpretation.fs
 \ include float.fs
-\ include search-order.fs
+\ include search.fs
 include glocals.fs
-include environ.fs
-\ include toolsext.fs
 include wordinfo.fs
 include vt100.fs
 \ include colorize.fs
 include see.fs
+include see-ext.fs
 include bufio.fs
 include debug.fs
+require stuff.fs
 include history.fs
 \ include doskey.fs
 include vt100key.fs
-require debugging.fs
+require debugs.fs
 require assert.fs
 require blocks.fs
-
-0 Value $?
-: sh  '# parse cr system  to $? ;
+require intcomp.fs
+require savesys.fs
 
 \ define the environmental queries for all the loaded wordsets
 \ since the blocks wordset is loaded in a single file, its queries
@@ -73,4 +78,4 @@ set-current
 
 warnings on
 
-require site-init.fs
+require siteinit.fs