--- gforth/startup.fs	2006/01/28 17:55:32	1.61
+++ gforth/startup.fs	2012/12/31 15:25:18	1.84
@@ -1,12 +1,12 @@
 \ startup file
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
 \ GNU General Public License for more details.
 
 \ You should have received a copy of the GNU General Public License
-\ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 \ don't require except.fs, because except.fs is not in included-files
 \ (see exboot.fs)
@@ -24,6 +23,10 @@
 require except.fs \ included on command line
 [THEN]
 
+[IFDEF] throw>error
+    ' throw>error Alias rethrow
+[THEN]
+
 warnings off
 include search.fs
 include environ.fs
@@ -39,7 +42,11 @@ include hash.fs
 \ include float.fs
 \ include search.fs
 require compat/strcomp.fs
-include glocals.fs
+' usable-dictionary-end @ dodefer: = [if]
+    include glocals.fs
+[else]
+    include glocals-1.60.fs
+[then]
 require float.fs
 require stuff.fs
 include wordinfo.fs
@@ -67,13 +74,20 @@ require ekey.fs
 require dosekey.fs
 [THEN]
 require quotes.fs
+require quotedstring.fs
+require parsedto.fs
+require substitute.fs
+require code.fs
 require see.fs
 require see-ext.fs
 require backtrac.fs
 require simp-see.fs
 require debug.fs
-require code.fs
 require dis-gdb.fs
+require libcc.fs
+require struct0x.fs
+require prelude.fs
+require str-exec.fs
 
 \ define the environmental queries for all the loaded wordsets
 \ since the blocks wordset is loaded in a single file, its queries
@@ -103,9 +117,16 @@ true constant string
 true constant string-ext
 \ extension queries
 ' noop alias X:deferred
+' noop alias X:defined
+' noop alias X:ekeys
 ' noop alias X:extension-query
+' noop alias X:fp-stack
+' noop alias X:ftrunc
+' noop alias X:number-prefixes
 ' noop alias X:parse-name
-' noop alias X:defined
+' noop alias X:required
+' noop alias X:structures
+' noop alias X:xchar
 set-current
 
 warnings on