--- gforth/engine/peephole.c	2002/02/10 14:02:25	1.6
+++ gforth/engine/peephole.c	2007/12/31 19:02:25	1.11
@@ -1,12 +1,12 @@
 /* Peephole optimization routines and tables
 
-  Copyright (C) 2001 Free Software Foundation, Inc.
+  Copyright (C) 2001,2002,2003,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/.
 */
 
 #include "config.h"
@@ -33,12 +32,12 @@ typedef struct Combination {
 } Combination;
 
 Combination peephole_table[] = {
-#include "peephole.i"
+#include PEEPHOLE_I
 };
 
 #ifdef PRINT_SUPER_LENGTHS
 char *prim_names[] = {
-#include "prim_names.i"
+#include PRIM_NAMES_I
 };
 
 Combination *find_super(Cell prim)