--- gforth/kernel/require.fs	2003/01/20 22:16:04	1.25
+++ gforth/kernel/require.fs	2010/05/13 09:48:45	1.35
@@ -1,12 +1,12 @@
 \ require.fs
 
-\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2006,2007 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/.
 
 \ Now: Kernel Module, Reloadable
 
@@ -34,7 +33,7 @@ create image-included-files 1 , A, ( poi
     \G source.  The result is valid only while the file is being
     \G loaded.  If the current input source is no (stream) file, the
     \G result is undefined.  In Gforth, the result is valid during the
-    \G whole seesion (but not across @code{savesystem} etc.).
+    \G whole session (but not across @code{savesystem} etc.).
     loadfilename 2@ ;
 
 : sourceline# ( -- u ) \ gforth		sourceline-number
@@ -72,29 +71,19 @@ create image-included-files 1 , A, ( poi
     2/ cell / included-files 2!
     2! ;
 
-has? new-input [IF]
-: included1 ( i*x file-id c-addr u -- j*x ) \ gforth
-    \G Include the file file-id with the name given by @var{c-addr u}.
-    save-mem 2dup add-included-file ( file-id )
-    ['] include-file2 catch
-    throw ;
-[ELSE]
 : included1 ( i*x file-id c-addr u -- j*x ) \ gforth
 \G Include the file file-id with the name given by @var{c-addr u}.
-    loadfilename 2@ 2>r
-    save-mem 2dup loadfilename 2!
-    add-included-file ( file-id )
-    ['] include-file2 catch
-    2r> loadfilename 2!
-    throw ;
-[THEN]
+    save-mem 2dup add-included-file
+    includefilename 2@ 2>r 2dup includefilename 2!
+    ['] read-loop execute-parsing-named-file
+    2r> includefilename 2! ;
 
 : included ( i*x c-addr u -- j*x ) \ file
     \G @code{include-file} the file whose name is given by the string
     \G @var{c-addr u}.
     open-fpath-file throw included1 ;
 
-: required ( i*x addr u -- j*x ) \ gforth
+: required ( i*x addr u -- i*x ) \ gforth
     \G @code{include-file} the file with the name given by @var{addr
     \G u}, if it is not @code{included} (or @code{required})
     \G already. Currently this works by comparing the name of the file