Fix $Header$ and some minor file header inconsistencies.

svn-id: r20444

53 files changed, 110 insertions, 57 deletions

diff --git a/sword2/anims.cpp b/sword2/anims.cpp
index 389e6a72ff..3390b7ab49 100644
--- a/sword2/anims.cpp
+++ b/sword2/anims.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 // ---------------------------------------------------------------------------
diff --git a/sword2/build_display.cpp b/sword2/build_display.cpp
index 2b22da0c60..bc5a31a1f9 100644
--- a/sword2/build_display.cpp
+++ b/sword2/build_display.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 // ---------------------------------------------------------------------------
diff --git a/sword2/build_display.h b/sword2/build_display.h
index d9fb0f82de..1a362da137 100644
--- a/sword2/build_display.h
+++ b/sword2/build_display.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef	_BUILD_DISPLAY
diff --git a/sword2/console.cpp b/sword2/console.cpp
index 2e05dafbb5..b465dc369f 100644
--- a/sword2/console.cpp
+++ b/sword2/console.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/console.h b/sword2/console.h
index c6dfeee2d5..95bfbe946d 100644
--- a/sword2/console.h
+++ b/sword2/console.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef	C_ONSOLE_H
diff --git a/sword2/controls.cpp b/sword2/controls.cpp
index 9906aba645..df1b38c83e 100644
--- a/sword2/controls.cpp
+++ b/sword2/controls.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/controls.h b/sword2/controls.h
index 1e0087b082..719489b3ae 100644
--- a/sword2/controls.h
+++ b/sword2/controls.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef	_CONTROL_S
diff --git a/sword2/debug.cpp b/sword2/debug.cpp
index e5a4cc101b..53fc200241 100644
--- a/sword2/debug.cpp
+++ b/sword2/debug.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/debug.h b/sword2/debug.h
index d4c6ba5b13..9b0b40f9ec 100644
--- a/sword2/debug.h
+++ b/sword2/debug.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef	D_DEBUG
diff --git a/sword2/defs.h b/sword2/defs.h
index 9e01e9e2eb..4acb484f34 100644
--- a/sword2/defs.h
+++ b/sword2/defs.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef	DEFS
diff --git a/sword2/driver/_mouse.cpp b/sword2/driver/_mouse.cpp
index 8f727f5997..db0cf00f73 100644
--- a/sword2/driver/_mouse.cpp
+++ b/sword2/driver/_mouse.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp
index aa89628315..0b5adb6a9c 100644
--- a/sword2/driver/animation.cpp
+++ b/sword2/driver/animation.cpp
@@ -5,18 +5,18 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
- *
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/driver/d_draw.cpp b/sword2/driver/d_draw.cpp
index 828831f211..7f278996fb 100644
--- a/sword2/driver/d_draw.cpp
+++ b/sword2/driver/d_draw.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp
index 7edad1e084..847f4808cf 100644
--- a/sword2/driver/d_sound.cpp
+++ b/sword2/driver/d_sound.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 // One feature still missing is the original's DipMusic() function which, as
diff --git a/sword2/driver/menu.cpp b/sword2/driver/menu.cpp
index a7edede076..07e00accb6 100644
--- a/sword2/driver/menu.cpp
+++ b/sword2/driver/menu.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/driver/palette.cpp b/sword2/driver/palette.cpp
index 4d9ddf024c..0b6b7a8ca2 100644
--- a/sword2/driver/palette.cpp
+++ b/sword2/driver/palette.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/driver/rdwin.cpp b/sword2/driver/rdwin.cpp
index 27696cedcc..310b66abf7 100644
--- a/sword2/driver/rdwin.cpp
+++ b/sword2/driver/rdwin.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp
index 1364628dd8..0a455bc671 100644
--- a/sword2/driver/render.cpp
+++ b/sword2/driver/render.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/driver/sprite.cpp b/sword2/driver/sprite.cpp
index 6137948dd8..a0ba7f7189 100644
--- a/sword2/driver/sprite.cpp
+++ b/sword2/driver/sprite.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/events.cpp b/sword2/events.cpp
index 411f014385..e8090414aa 100644
--- a/sword2/events.cpp
+++ b/sword2/events.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/function.cpp b/sword2/function.cpp
index 3a9944a5cd..705ec9dde0 100644
--- a/sword2/function.cpp
+++ b/sword2/function.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/header.h b/sword2/header.h
index 27e0ca2f8d..9aefa52832 100644
--- a/sword2/header.h
+++ b/sword2/header.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef	_HEADER
diff --git a/sword2/icons.cpp b/sword2/icons.cpp
index 8dc76fa9f2..980c20e3b4 100644
--- a/sword2/icons.cpp
+++ b/sword2/icons.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/icons.h b/sword2/icons.h
index 3872bd4ad5..ab5ea578ca 100644
--- a/sword2/icons.h
+++ b/sword2/icons.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef	_ICONS
diff --git a/sword2/interpreter.cpp b/sword2/interpreter.cpp
index 35ec5cfe05..1a6e7080b8 100644
--- a/sword2/interpreter.cpp
+++ b/sword2/interpreter.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/interpreter.h b/sword2/interpreter.h
index f1081a341f..365f818a98 100644
--- a/sword2/interpreter.h
+++ b/sword2/interpreter.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef _INTERPRETER
diff --git a/sword2/layers.cpp b/sword2/layers.cpp
index 310bd0be73..0b59b5a9b1 100644
--- a/sword2/layers.cpp
+++ b/sword2/layers.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 // high level layer initialising
diff --git a/sword2/layers.h b/sword2/layers.h
index c1de13abf1..88aff933b3 100644
--- a/sword2/layers.h
+++ b/sword2/layers.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef	_LAYERS
diff --git a/sword2/logic.cpp b/sword2/logic.cpp
index 96670cacb5..c26d5615b9 100644
--- a/sword2/logic.cpp
+++ b/sword2/logic.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/logic.h b/sword2/logic.h
index b6c5fccce5..9e264f603c 100644
--- a/sword2/logic.h
+++ b/sword2/logic.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 // logic management
diff --git a/sword2/maketext.cpp b/sword2/maketext.cpp
index fabf112d30..5edaf5e41e 100644
--- a/sword2/maketext.cpp
+++ b/sword2/maketext.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 // MAKETEXT	- Constructs a single-frame text sprite: returns a handle to a
diff --git a/sword2/maketext.h b/sword2/maketext.h
index e41e50d35e..364a412857 100644
--- a/sword2/maketext.h
+++ b/sword2/maketext.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef _MAKETEXT_H
diff --git a/sword2/memory.cpp b/sword2/memory.cpp
index 5457fe5cb4..7da4e86b51 100644
--- a/sword2/memory.cpp
+++ b/sword2/memory.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 // The new memory manager, now only used by the resource manager. The original
diff --git a/sword2/memory.h b/sword2/memory.h
index c35bd55545..3154842cd9 100644
--- a/sword2/memory.h
+++ b/sword2/memory.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef	MEMORY_H
diff --git a/sword2/mouse.cpp b/sword2/mouse.cpp
index 6e6610685c..f8c315a47f 100644
--- a/sword2/mouse.cpp
+++ b/sword2/mouse.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/mouse.h b/sword2/mouse.h
index 52bd1b1603..bed5e032ba 100644
--- a/sword2/mouse.h
+++ b/sword2/mouse.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef MOUSE_H
diff --git a/sword2/object.h b/sword2/object.h
index 1d3b717eb3..1fd434f8a0 100644
--- a/sword2/object.h
+++ b/sword2/object.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef	_SCRIPT_STRUCTURES
diff --git a/sword2/protocol.cpp b/sword2/protocol.cpp
index bb791c5b49..23010e27a9 100644
--- a/sword2/protocol.cpp
+++ b/sword2/protocol.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/resman.cpp b/sword2/resman.cpp
index ea6da716fd..7387dc8f50 100644
--- a/sword2/resman.cpp
+++ b/sword2/resman.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/resman.h b/sword2/resman.h
index f76f79fc52..18b5cb8765 100644
--- a/sword2/resman.h
+++ b/sword2/resman.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef	RESMAN_H
diff --git a/sword2/router.cpp b/sword2/router.cpp
index 62293f49e0..bbca609e3c 100644
--- a/sword2/router.cpp
+++ b/sword2/router.cpp
@@ -1,5 +1,6 @@
 /* Copyright (C) 1994-1998 Revolution Software Ltd.
- * Copyright (C) 2003-2006 The ScummVM project *
+ * Copyright (C) 2003-2006 The ScummVM project
+ *
  * This program 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
@@ -14,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 // ---------------------------------------------------------------------------
diff --git a/sword2/router.h b/sword2/router.h
index f32eda54d3..45efd046bd 100644
--- a/sword2/router.h
+++ b/sword2/router.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef _ROUTER_H
diff --git a/sword2/save_rest.cpp b/sword2/save_rest.cpp
index 7157c084aa..df03c21be3 100644
--- a/sword2/save_rest.cpp
+++ b/sword2/save_rest.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 // ---------------------------------------------------------------------------
diff --git a/sword2/save_rest.h b/sword2/save_rest.h
index fcec1367d9..9463f3fd4a 100644
--- a/sword2/save_rest.h
+++ b/sword2/save_rest.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef	SAVE_REST_H
diff --git a/sword2/scroll.cpp b/sword2/scroll.cpp
index 3319edea1f..3d0a263bc6 100644
--- a/sword2/scroll.cpp
+++ b/sword2/scroll.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/sound.cpp b/sword2/sound.cpp
index 6ee3ef87b9..d855e88afb 100644
--- a/sword2/sound.cpp
+++ b/sword2/sound.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 // ---------------------------------------------------------------------------
diff --git a/sword2/sound.h b/sword2/sound.h
index 5b5ce74a9f..7390a60bbc 100644
--- a/sword2/sound.h
+++ b/sword2/sound.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 /*****************************************************************************
diff --git a/sword2/speech.cpp b/sword2/speech.cpp
index f98f7f599a..da6bd258ea 100644
--- a/sword2/speech.cpp
+++ b/sword2/speech.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/startup.cpp b/sword2/startup.cpp
index 202cf594a8..2e1dd7b0ae 100644
--- a/sword2/startup.cpp
+++ b/sword2/startup.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp
index 926a90e91e..6056d636b7 100644
--- a/sword2/sword2.cpp
+++ b/sword2/sword2.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/sword2.h b/sword2/sword2.h
index 23853e1757..bcb80ec957 100644
--- a/sword2/sword2.h
+++ b/sword2/sword2.h
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #ifndef	_SWORD2
diff --git a/sword2/sync.cpp b/sword2/sync.cpp
index 2bb0536da9..205e273873 100644
--- a/sword2/sync.cpp
+++ b/sword2/sync.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 #include "common/stdafx.h"
diff --git a/sword2/walker.cpp b/sword2/walker.cpp
index dfc0728f03..82ef80f65f 100644
--- a/sword2/walker.cpp
+++ b/sword2/walker.cpp
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header$
+ * $URL$
+ * $Id$
  */
 
 // WALKER.CPP by James (14nov96)