--- gforth/startup.fs	1997/02/06 21:23:06	1.21
+++ gforth/startup.fs	1997/09/01 23:07:09	1.24
@@ -19,18 +19,17 @@
 \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 warnings off
-
+include search.fs
+include environ.fs
+include envos.fs
 include errors.fs
 include extend.fs              \ load core-extended
-\ include tools.fs               \ load tools ( .s dump )
-\ include toolsext.fs
+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
@@ -40,13 +39,17 @@ include bufio.fs
 include debug.fs
 require stuff.fs
 include history.fs
-\ include doskey.fs
+s" os-class" environment? dup [IF] drop s" dos" compare 0= [THEN]
+[IF]
+include doskey.fs
+[ELSE]
 include vt100key.fs
-require debugging.fs
+[THEN]
+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
@@ -76,8 +79,6 @@ true constant string
 true constant string-ext
 set-current
 
-
-
 warnings on
 
-require site-init.fs
+require siteinit.fs