--- gforth/startup.fs	1996/05/23 15:13:12	1.18
+++ gforth/startup.fs	2000/05/19 09:24:38	1.32
@@ -1,6 +1,6 @@
 \ startup file
 
-\ Copyright (C) 1995 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -18,28 +18,42 @@
 \ along with this program; if not, write to the Free Software
 \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+\ require exceptions.fs \ included on command line
 warnings off
+include search.fs
+include environ.fs
+include envos.fs
+include errors.fs
+include extend.fs              \ load core-extended
+include hash.fs
 
-require interpretation.fs
+\ require interpretation.fs
 \ include float.fs
-\ include search-order.fs
+\ include search.fs
+require stuff.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
+s" os-class" environment? dup [IF] drop s" unix" compare 0= [THEN]
+[IF]
 include vt100key.fs
-require debugging.fs
+[ELSE]
+include doskey.fs
+[THEN]
+require debugs.fs
 require assert.fs
 require blocks.fs
-require dumpimage.fs
+require intcomp.fs
+require savesys.fs
+require table.fs
+require ekey.fs
+require backtrace.fs
 
 \ define the environmental queries for all the loaded wordsets
 \ since the blocks wordset is loaded in a single file, its queries
@@ -69,8 +83,6 @@ true constant string
 true constant string-ext
 set-current
 
-
-
 warnings on
 
-require site-init.fs
+require siteinit.fs