--- gforth/startup.fs	1996/08/26 10:07:22	1.20
+++ gforth/startup.fs	1997/05/21 20:39:41	1.22
@@ -20,9 +20,14 @@
 
 warnings off
 
+include errors.fs
+include extend.fs              \ load core-extended
+\ include tools.fs               \ load tools ( .s dump )
+\ include toolsext.fs
+
 \ require interpretation.fs
 \ include float.fs
-\ include search-order.fs
+\ include search.fs
 include glocals.fs
 include environ.fs
 \ include toolsext.fs
@@ -30,17 +35,18 @@ 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
 require intcomp.fs
-require dumpimage.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
@@ -74,4 +80,4 @@ set-current
 
 warnings on
 
-require site-init.fs
+require siteinit.fs