Remove some old define('XXX_PHP, '') statements - these were a debugging aid, many years ago. Also update the copyright message for the CSS parser library

47 files changed, 677 insertions, 818 deletions

diff --git a/includes/authentication.php b/includes/authentication.php
index bf85016595..0c02a751da 100644
--- a/includes/authentication.php
+++ b/includes/authentication.php
@@ -35,8 +35,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_AUTHENTICATION_PHP', '');
-
 /**
  * authenticate a username and password
  *
diff --git a/includes/config_data.php b/includes/config_data.php
index 6bbc45c015..9e18c94a5f 100644
--- a/includes/config_data.php
+++ b/includes/config_data.php
@@ -1,42 +1,38 @@
 <?php
-/**
- * Application configuration data.  Data here has no GUI to edit it,
- * although most of it can be altered to customise local installations.
- *
- * NOTE: The one-item-per-line and extra-comma-after-last-item approach
- * is used to allow SVN to reliably merge changes for users that have
- * customised their local copy of this file.
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2010 PGV Development Team.
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Id$
- */
+// Application configuration data.  Data here has no GUI to edit it,
+// although most of it can be altered to customise local installations.
+//
+// NOTE: The one-item-per-line and extra-comma-after-last-item approach
+// is used to allow SVN to reliably merge changes for users that have
+// customised their local copy of this file.
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2010 PGV Development Team.
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_CONFIG_DATA_PHP', '');
-
 // Unknown surname
 $UNKNOWN_NN=WT_I18N::translate_c('Unknown surname', '…');
 
diff --git a/includes/cssparser.inc.php b/includes/cssparser.inc.php
index 515c432281..76269410da 100644
--- a/includes/cssparser.inc.php
+++ b/includes/cssparser.inc.php
@@ -1,23 +1,33 @@
 <?php
-/**
- * Class to parse css information.
- *
- * See the readme file : http://www.phpclasses.org/browse/file/4685.html
- *
- * $Id$
- *
- * @author http://www.phpclasses.org/browse/package/1289.html
- * @package webtrees
- * @subpackage Charts
- */
+// Class to parse css information.
+// 
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Original author, and copyright (C) Thomas Björk
+// http://www.phpclasses.org/browse/package/1289.html
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_CSS_PARSER_PHP', '');
-
 class cssparser {
   var $css;
   var $html;
diff --git a/includes/db_schema/db_schema_10_11.php b/includes/db_schema/db_schema_10_11.php
index 10f00c9536..b83758eeac 100644
--- a/includes/db_schema/db_schema_10_11.php
+++ b/includes/db_schema/db_schema_10_11.php
@@ -28,15 +28,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-// @version $Id$
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_DB_SCHEMA_10_11', '');
-
 // Delete some old/unused config settings
 self::exec("DELETE FROM `##gedcom_setting` WHERE setting_name IN ('SEARCH_FACTS_DEFAULT', 'DISPLAY_JEWISH_GERESHAYIM', 'DISPLAY_JEWISH_THOUSANDS')");
 
diff --git a/includes/db_schema/db_schema_11_12.php b/includes/db_schema/db_schema_11_12.php
index 2f440123d7..5f575d5fe2 100644
--- a/includes/db_schema/db_schema_11_12.php
+++ b/includes/db_schema/db_schema_11_12.php
@@ -30,15 +30,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-// @version $Id: db_schema_10_11.php 11634 2011-05-28 17:26:04Z greg $
+// $Id: db_schema_10_11.php 11634 2011-05-28 17:26:04Z greg $
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_DB_SCHEMA_11_12', '');
-
 // Remove slashes from INDI names
 self::exec("UPDATE `##name` SET n_full=REPLACE(n_full, '/', '') WHERE n_surn IS NOT NULL");
 
diff --git a/includes/db_schema/db_schema_1_2.php b/includes/db_schema/db_schema_1_2.php
index 05f7a905a1..4c4f02d0e9 100644
--- a/includes/db_schema/db_schema_1_2.php
+++ b/includes/db_schema/db_schema_1_2.php
@@ -27,15 +27,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-// @version $Id$
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_DB_SCHEMA_1_2', '');
-
 self::exec(
 	"CREATE TABLE IF NOT EXISTS `##session` (".
 	" session_id   CHAR(32)    NOT NULL,".
diff --git a/includes/db_schema/db_schema_2_3.php b/includes/db_schema/db_schema_2_3.php
index 3a53cb12c0..e3a3999f39 100644
--- a/includes/db_schema/db_schema_2_3.php
+++ b/includes/db_schema/db_schema_2_3.php
@@ -27,15 +27,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-// @version $Id$
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_DB_SCHEMA_2_3', '');
-
 self::exec(
 	"CREATE TABLE IF NOT EXISTS `##gedcom_chunk` (".
 	" gedcom_chunk_id INTEGER AUTO_INCREMENT NOT NULL,".
diff --git a/includes/db_schema/db_schema_3_4.php b/includes/db_schema/db_schema_3_4.php
index 978ac0a404..7b7d5590f6 100644
--- a/includes/db_schema/db_schema_3_4.php
+++ b/includes/db_schema/db_schema_3_4.php
@@ -30,15 +30,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-// @version $Id$
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_DB_SCHEMA_3_4', '');
-
 self::exec(
 	"INSERT IGNORE INTO `##user_gedcom_setting` (user_id, gedcom_id, setting_name, setting_value)".
 	" SELECT u.user_id, g.gedcom_id, 'RELATIONSHIP_PATH_LENGTH', LEAST(us1.setting_value, gs1.setting_value)".
diff --git a/includes/db_schema/db_schema_4_5.php b/includes/db_schema/db_schema_4_5.php
index 7b680a4966..bb283687d7 100644
--- a/includes/db_schema/db_schema_4_5.php
+++ b/includes/db_schema/db_schema_4_5.php
@@ -28,15 +28,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-// @version $Id$
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_DB_SCHEMA_4_5', '');
-
 try {
 	self::exec("ALTER TABLE `##gedcom` ADD COLUMN sort_order INTEGER NOT NULL DEFAULT 0");
 } catch (PDOException $ex) {
diff --git a/includes/db_schema/db_schema_5_6.php b/includes/db_schema/db_schema_5_6.php
index 0d7d0d5d6a..0410cc6e85 100644
--- a/includes/db_schema/db_schema_5_6.php
+++ b/includes/db_schema/db_schema_5_6.php
@@ -26,15 +26,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-// @version $Id$
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_DB_SCHEMA_5_6', '');
-
 $settings=self::prepare(
 	"SELECT gedcom_id, setting_value FROM `##gedcom_setting` WHERE setting_name='SHOW_RELATIVES_EVENTS'"
 )->fetchAssoc();
diff --git a/includes/db_schema/db_schema_6_7.php b/includes/db_schema/db_schema_6_7.php
index 7fdf8b39f9..baee7a35e1 100644
--- a/includes/db_schema/db_schema_6_7.php
+++ b/includes/db_schema/db_schema_6_7.php
@@ -26,15 +26,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-// @version $Id$
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_DB_SCHEMA_6_7', '');
-
 try {
 	self::exec(
 		"DROP TABLE `##remotelinks`"
diff --git a/includes/db_schema/db_schema_7_8.php b/includes/db_schema/db_schema_7_8.php
index 2fcc150fb3..3763e4ff13 100644
--- a/includes/db_schema/db_schema_7_8.php
+++ b/includes/db_schema/db_schema_7_8.php
@@ -26,15 +26,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-// @version $Id$
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_DB_SCHEMA_7_8', '');
-
 self::exec(
 	"UPDATE `##gedcom_setting` SET setting_value=TRIM(LEADING 'themes/' FROM TRIM(TRAILING '/' FROM setting_value)) WHERE setting_name='THEME_DIR'"
 );
diff --git a/includes/db_schema/db_schema_8_9.php b/includes/db_schema/db_schema_8_9.php
index 079d8c464f..77036638c7 100644
--- a/includes/db_schema/db_schema_8_9.php
+++ b/includes/db_schema/db_schema_8_9.php
@@ -26,15 +26,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-// @version $Id$
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_DB_SCHEMA_8_9', '');
-
 try {
 	self::exec(
 		"ALTER TABLE `##dates` CHANGE d_type d_type ENUM('@#DGREGORIAN@', '@#DJULIAN@', '@#DHEBREW@', '@#DFRENCH R@', '@#DHIJRI@', '@#DROMAN@', '@#DJALALI@')"
diff --git a/includes/db_schema/db_schema_9_10.php b/includes/db_schema/db_schema_9_10.php
index b221140e39..623e9e1147 100644
--- a/includes/db_schema/db_schema_9_10.php
+++ b/includes/db_schema/db_schema_9_10.php
@@ -26,15 +26,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-// @version $Id$
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_DB_SCHEMA_9_10', '');
-
 // A bug in the original version of db_schema_8_9 failed to update this :-(
 // Do it again....
 try {
diff --git a/includes/dmsounds_UTF8.php b/includes/dmsounds_UTF8.php
index 2c9df8bd8b..ef515ca80e 100644
--- a/includes/dmsounds_UTF8.php
+++ b/includes/dmsounds_UTF8.php
@@ -1,38 +1,33 @@
 <?php
-/**
- * Sound table for Daitch-Mokotoff "Sounds like" algorithm
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @version $Id$
- */
+// Sound table for Daitch-Mokotoff "Sounds like" algorithm
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_DMSOUNDS_UTF8_PHP', '');
-
 // Hebrew alphabet
 define('ALEF', 'א');
 define('BET', 'ב');
diff --git a/includes/functions/functions.php b/includes/functions/functions.php
index 7a8b8cfc19..01d1b293d2 100644
--- a/includes/functions/functions.php
+++ b/includes/functions/functions.php
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_FUNCTIONS_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_utf-8.php';
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/includes/functions/functions_charts.php b/includes/functions/functions_charts.php
index 6f6f57523e..d9e4c1c352 100644
--- a/includes/functions/functions_charts.php
+++ b/includes/functions/functions_charts.php
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_FUNCTIONS_CHARTS_PHP', '');
-
 /**
  * print a table cell with sosa number
  *
diff --git a/includes/functions/functions_date.php b/includes/functions/functions_date.php
index 6073410322..dc0c77bab1 100644
--- a/includes/functions/functions_date.php
+++ b/includes/functions/functions_date.php
@@ -1,38 +1,33 @@
 <?php
-/**
-* Date Functions that can be used by any page in webtrees
-*
-* webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
-* Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
-*
-* 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*
-* @package webtrees
-* @version $Id$
-*/
+// Date Functions that can be used by any page in webtrees
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_FUNCTIONS_DATE_PHP', '');
-
 /**
 * translate gedcom age string
 *
diff --git a/includes/functions/functions_db.php b/includes/functions/functions_db.php
index f949931593..fe45206c65 100644
--- a/includes/functions/functions_db.php
+++ b/includes/functions/functions_db.php
@@ -1,44 +1,38 @@
 <?php
-/**
-* Functions to query the database.
-*
-* This file implements the datastore functions necessary for webtrees
-* to use an SQL database as its datastore.
-*
-* webtrees: Web based Family History software
- * Copyright (C) 2011 webtrees development team.
- *
- * Derived from PhpGedView
-* Copyright (C) 2002 to 2010  PGV Development Team.  All rights reserved.
-*
-* Modifications Copyright (c) 2010 Greg Roach
-*
-* 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*
-* @version $Id$
-* @package webtrees
-* @subpackage DB
-*/
+// Functions to query the database.
+//
+// This file implements the datastore functions necessary for webtrees
+// to use an SQL database as its datastore.
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2010  PGV Development Team.  All rights reserved.
+//
+// Modifications Copyright (c) 2010 Greg Roach
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_FUNCTIONS_DB_PHP', '');
-
 ////////////////////////////////////////////////////////////////////////////////
 // Count the number of records linked to a given record
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php
index e0cd843436..bd408db519 100644
--- a/includes/functions/functions_edit.php
+++ b/includes/functions/functions_edit.php
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_FUNCTIONS_EDIT_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_import.php';
 
 // Create an edit control for inline editing using jeditable
diff --git a/includes/functions/functions_export.php b/includes/functions/functions_export.php
index da97aa7ea3..5152e8c696 100644
--- a/includes/functions/functions_export.php
+++ b/includes/functions/functions_export.php
@@ -1,41 +1,35 @@
 <?php
-/**
-* Functions for exporting data
-*
-* webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
-* Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
-*
-* Modifications Copyright (c) 2010 Greg Roach
-*
-* 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*
-* @package webtrees
-* @subpackage Admin
-* @version $Id$
-*/
+// Functions for exporting data
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
+//
+// Modifications Copyright (c) 2010 Greg Roach
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_FUNCTIONS_EXPORT_PHP', '');
-
 // Tidy up a gedcom record on export, for compatibility/portability
 function reformat_record_export($rec) {
 	global $WORD_WRAPPED_NOTES;
diff --git a/includes/functions/functions_import.php b/includes/functions/functions_import.php
index 6c6ac79d8b..74989aec92 100644
--- a/includes/functions/functions_import.php
+++ b/includes/functions/functions_import.php
@@ -1,42 +1,35 @@
 <?php
-/**
-*
-* Import specific functions
-*
-* webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
-* Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
-*
-* Modifications Copyright (c) 2010 Greg Roach
-*
-* 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*
-* @version $Id$
-* @package webtrees
-* @subpackage DB
-*/
+// Import-specific functions
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
+//
+// Modifications Copyright (c) 2010 Greg Roach
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_FUNCTIONS_IMPORT_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_export.php';
 
 // Tidy up a gedcom record on import, so that we can access it consistently/efficiently.
diff --git a/includes/functions/functions_mail.php b/includes/functions/functions_mail.php
index 551fc5ed5e..a713543f31 100644
--- a/includes/functions/functions_mail.php
+++ b/includes/functions/functions_mail.php
@@ -1,40 +1,35 @@
 <?php
-/**
- * Mail specific functions
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
- *
- * Modifications Copyright (c) 2010 Greg Roach
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @version $Id$
- */
+// Mail specific functions
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
+//
+// Modifications Copyright (c) 2010 Greg Roach
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_FUNCTIONS_MAIL_PHP', '');
-
 /**
  * this function is a wrapper to the php mail() function so that we can change settings globally
  * for more info on format="flowed" see: http://www.joeclark.org/ffaq.html
diff --git a/includes/functions/functions_mediadb.php b/includes/functions/functions_mediadb.php
index 9ac0c8df6d..6a57143514 100644
--- a/includes/functions/functions_mediadb.php
+++ b/includes/functions/functions_mediadb.php
@@ -28,11 +28,9 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_FUNCTIONS_MEDIADB_PHP', '');
-
 //-- Setup array of media types
 $MEDIATYPE = array("a11", "acb", "adc", "adf", "afm", "ai", "aiff", "aif", "amg", "anm", "ans", "apd", "asf", "au", "avi", "awm", "bga", "bmp", "bob", "bpt", "bw", "cal", "cel", "cdr", "cgm", "cmp", "cmv", "cmx", "cpi", "cur", "cut", "cvs", "cwk", "dcs", "dib", "dmf", "dng", "doc", "dsm", "dxf", "dwg", "emf", "enc", "eps", "fac", "fax", "fit", "fla", "flc", "fli", "fpx", "ftk", "ged", "gif", "gmf", "hdf", "iax", "ica", "icb", "ico", "idw", "iff", "img", "jbg", "jbig", "jfif", "jpe", "jpeg", "jp2", "jpg", "jtf", "jtp", "lwf", "mac", "mid", "midi", "miff", "mki", "mmm", ".mod", "mov", "mp2", "mp3", "mpg", "mpt", "msk", "msp", "mus", "mvi", "nap", "ogg", "pal", "pbm", "pcc", "pcd", "pcf", "pct", "pcx", "pdd", "pdf", "pfr", "pgm", "pic", "pict", "pk", "pm3", "pm4", "pm5", "png", "ppm", "ppt", "ps", "psd", "psp", "pxr", "qt", "qxd", "ras", "rgb", "rgba", "rif", "rip", "rla", "rle", "rpf", "rtf", "scr", "sdc", "sdd", "sdw", "sgi", "sid", "sng", "swf", "tga", "tiff", "tif", "txt", "text", "tub", "ul", "vda", "vis", "vob", "vpg", "vst", "wav", "wdb", "win", "wk1", "wks", "wmf", "wmv", "wpd", "wxf", "wp4", "wp5", "wp6", "wpg", "wpp", "xbm", "xls", "xpm", "xwd", "yuv", "zgm");
-$BADMEDIA = array(".", "..", "CVS", "thumbs", "index.php", "MediaInfo.txt", ".cvsignore", ".svn", "watermark");
+$BADMEDIA = array(".", "..", "thumbs", "index.php", "MediaInfo.txt", ".svn", "watermark");
 
 /*
 ****************************
diff --git a/includes/functions/functions_name.php b/includes/functions/functions_name.php
index 7e133711c1..d8cfcbbc67 100644
--- a/includes/functions/functions_name.php
+++ b/includes/functions/functions_name.php
@@ -1,38 +1,33 @@
 <?php
-/**
- * Name Specific Functions
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @version $Id$
- */
+// Name Specific Functions
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_FUNCTIONS_NAME_PHP', '');
-
 /**
  * Takes a string and converts certain characters in the string to others for the purpose of soundex searches
  */
diff --git a/includes/functions/functions_places.php b/includes/functions/functions_places.php
index 53eb34aba2..c33fd5b50c 100644
--- a/includes/functions/functions_places.php
+++ b/includes/functions/functions_places.php
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_FUNCTIONS_PLACE_PHP', '');
-
 /**
  * get the URL to link to a place
  * @string a url that can be used to link to placelist
diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php
index 30f934bb6a..56ba6247f4 100644
--- a/includes/functions/functions_print.php
+++ b/includes/functions/functions_print.php
@@ -30,8 +30,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_FUNCTIONS_PRINT_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_charts.php';
 
 /**
diff --git a/includes/functions/functions_print_facts.php b/includes/functions/functions_print_facts.php
index 233e572bb3..df2123f5aa 100644
--- a/includes/functions/functions_print_facts.php
+++ b/includes/functions/functions_print_facts.php
@@ -30,8 +30,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_FUNCTIONS_PRINT_FACTS_PHP', '');
-
 // print a fact record, for the gedcom object pages.
 function print_fact(WT_Event $eventObj) {
 	global $HIDE_GEDCOM_ERRORS, $SHOW_FACT_ICONS, $n_chil, $n_gchi;
diff --git a/includes/functions/functions_print_lists.php b/includes/functions/functions_print_lists.php
index e38ae95873..92e7e75843 100644
--- a/includes/functions/functions_print_lists.php
+++ b/includes/functions/functions_print_lists.php
@@ -31,8 +31,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_FUNCTIONS_PRINT_LISTS_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_places.php';
 
 /**
diff --git a/includes/functions/functions_privacy.php b/includes/functions/functions_privacy.php
index 606834cce2..c6f2bb16b3 100644
--- a/includes/functions/functions_privacy.php
+++ b/includes/functions/functions_privacy.php
@@ -1,41 +1,33 @@
 <?php
-/**
-* Privacy Functions
-*
-* See http://www.phpgedview.net/privacy.php for more information on privacy in webtrees
-*
-* webtrees: Web based Family History software
-* Copyright (C) 2010 webtrees development team.
-*
-* Derived from PhpGedView
-* Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
-*
-* 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*
-* @version $Id$
-* @package webtrees
-* @subpackage Privacy
-*/
+// Privacy Functions
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2009 PGV Development Team.  All rights reserved.
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_FUNCTIONS_PRIVACY_PHP', '');
-
 // Can we display a level 1 record?
 // Assume we have already called canDisplayRecord() to check the parent level 0 object
 function canDisplayFact($xref, $ged_id, $gedrec, $access_level=WT_USER_ACCESS_LEVEL) {
diff --git a/includes/functions/functions_rtl.php b/includes/functions/functions_rtl.php
index 176b26b578..8a17f17bf9 100644
--- a/includes/functions/functions_rtl.php
+++ b/includes/functions/functions_rtl.php
@@ -1,42 +1,37 @@
 <?php
-/**
- * RTL Functions
- *
- * The functions in this file are common to all webtrees pages and include date conversion
- * routines and sorting functions.
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 to 2011 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @version $Id$
- */
+// RTL Functions
+//
+// The functions in this file are common to all webtrees pages and include date conversion
+// routines and sorting functions.
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_FUNCTIONS_RTL_PHP', '');
-
 $SpecialChar = array(' ','.',',','"','\'','/','\\','|',':',';','+','&','#','@','-','=','*','%','!','?','$','<','>',"\n");
 $SpecialPar = array('(',')','[',']','{','}');
 $SpecialNum  = array('0','1','2','3','4','5','6','7','8','9');
diff --git a/includes/functions/functions_utf-8.php b/includes/functions/functions_utf-8.php
index 01e3c66fa5..703fa98253 100644
--- a/includes/functions/functions_utf-8.php
+++ b/includes/functions/functions_utf-8.php
@@ -1,35 +1,30 @@
 <?php
-/**
- * UTF-8 versions of PHP string functions
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @version $Id$
- */
+// UTF-8 versions of PHP string functions
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_FUNCTIONS_UTF_8_PHP', '');
-
 // Identify the script used in a given string.  Just look at the first significant character.
 // If there are mixed scripts, then the enclosed scripts should already have been wrapped
 // in lrm/rlm markup.
diff --git a/includes/media_reorder.php b/includes/media_reorder.php
index e6c00d20b3..afa3a4dea7 100644
--- a/includes/media_reorder.php
+++ b/includes/media_reorder.php
@@ -28,8 +28,6 @@ if (!defined('WT_WEBTREES')) {
 	exit;
 }
 
-define('WT_MEDIA_REORDER_PHP', '');
-
 require_once WT_ROOT.'includes/functions/functions_print_facts.php';
 
 	echo "<br /><b>".WT_I18N::translate('Re-order media')."</b>";
diff --git a/includes/media_reorder_count.php b/includes/media_reorder_count.php
index 62c5b78f13..2e3ea30500 100644
--- a/includes/media_reorder_count.php
+++ b/includes/media_reorder_count.php
@@ -1,40 +1,33 @@
 <?php
-/**
- * Provides media count for reorder media Items using drag and drop
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2009  PHPGedView Development Team.  All rights reserved.
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @subpackage Module
- * @version $Id$
- * @author Brian Holland
- */
+// Provides media count for reorder media Items using drag and drop
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2009  PHPGedView Development Team.  All rights reserved.
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_MEDIA_REORDER_COUNT_PHP', '');
-
 global $pid;
 // Find if indi and family associated media exists and then count them ( $tot_med_ct)  ===================================================
 // Check indi gedcom items
diff --git a/includes/media_tab_head.php b/includes/media_tab_head.php
index 83adfcb85a..f9d5600734 100644
--- a/includes/media_tab_head.php
+++ b/includes/media_tab_head.php
@@ -1,40 +1,33 @@
 <?php
-/**
- * Provides media tab header for reorder media Items using drag and drop
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2009  PHPGedView Development Team.  All rights reserved.
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @subpackage Module
- * @version $Id$
- * @author Brian Holland
- */
+// Provides media tab header for reorder media Items using drag and drop
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2009  PHPGedView Development Team.  All rights reserved.
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_MEDIA_TAB_HEAD_PHP', '');
-
 global $gedrec, $pid;
 
 require_once WT_ROOT.'js/prototype.js.htm';
diff --git a/includes/reportheader.php b/includes/reportheader.php
index 5b55a9658e..f2fcf3c07d 100644
--- a/includes/reportheader.php
+++ b/includes/reportheader.php
@@ -1,22 +1,34 @@
 <?php
-
-/**
- * Report Header Parser
- *
- * used by the SAX parser to generate PDF reports from the XML report file.
- *
- * @package webtrees
- * @subpackage Reports
- * @version $Id$
- */
+// Report Header Parser
+// used by the SAX parser to generate PDF reports from the XML report file.
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_REPORTHEADER_PHP', '');
-
 /**
  * element handlers array
  *
diff --git a/includes/session_spider.php b/includes/session_spider.php
index a19b24dccb..3bf97b482a 100644
--- a/includes/session_spider.php
+++ b/includes/session_spider.php
@@ -1,39 +1,33 @@
 <?php
-/**
- * Startup and session logic for handling Bots and Spiders
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2008 to 2009  PGV Development Team.  All rights reserved.
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @subpackage admin
- * @version $Id$
- */
+// Startup and session logic for handling Bots and Spiders
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2008 to 2009  PGV Development Team.  All rights reserved.
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_SESSION_SPIDER_PHP', '');
-
 /**
  * Changes the session same for known spiders
  * session names are limited to alphanum upper and lower only.
diff --git a/includes/specialchars.php b/includes/specialchars.php
index d076ec557a..6359210a1d 100644
--- a/includes/specialchars.php
+++ b/includes/specialchars.php
@@ -1,57 +1,51 @@
 <?PHP
-/**
- * Special Character tables, for use by JavaScript to input characters
- * that aren't on your keyboard
- *
- * THIS FILE MUST BE SAVED IN UTF-8 ENCODING (or some special characters will be lost)
- *
- * When updating, be sure to add the language into the array $specialchar_languages,
- * add a case for that language into the switch, and add any new special characters
- * into the default case of the switch near the bottom.
- *
- * Languages alpha by name in original language.
- * Special characters by language from European Commision, Research in Official Statistics:
- * http://europa.eu.int/comm/eurostat/research/index.htm?http://europa.eu.int/en/comm/eurostat/research/isi/special/&1
- * Other sources:
- * Czech: http://webdesign.about.com/library/blhtmlcodes-cz.htm
- * Irish: offline sources
- * Hawaiian: http://www.olelo.hawaii.edu/eng/resources/unicode.html
- * Lithuanian: http://www.eki.ee/letter/chardata.cgi?lang=lt+Lithuanian&script=latin
- *
- * Other special characters are all listed at the bottom.
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2007  PGV Development Team
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @subpackage Languages
- * @version $Id$
- */
+// Special Character tables, for use by JavaScript to input characters
+// that aren't on your keyboard
+//
+// THIS FILE MUST BE SAVED IN UTF-8 ENCODING (or some special characters will be lost)
+//
+// When updating, be sure to add the language into the array $specialchar_languages,
+// add a case for that language into the switch, and add any new special characters
+// into the default case of the switch near the bottom.
+//
+// Languages alpha by name in original language.
+// Special characters by language from European Commision, Research in Official Statistics:
+// http://europa.eu.int/comm/eurostat/research/index.htm?http://europa.eu.int/en/comm/eurostat/research/isi/special/&1
+// Other sources:
+// Czech: http://webdesign.about.com/library/blhtmlcodes-cz.htm
+// Irish: offline sources
+// Hawaiian: http://www.olelo.hawaii.edu/eng/resources/unicode.html
+// Lithuanian: http://www.eki.ee/letter/chardata.cgi?lang=lt+Lithuanian&script=latin
+//
+// Other special characters are all listed at the bottom.
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2007  PGV Development Team
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_SPECIALCHARS_PHP', '');
-
 $specialchar_languages = array(
 	"af" => Zend_Locale::getTranslation('af', 'language', WT_LOCALE),
 	"cs" => Zend_Locale::getTranslation('cs', 'language', WT_LOCALE),
diff --git a/modules_v2/clippings/clippings_ctrl.php b/modules_v2/clippings/clippings_ctrl.php
index 263b80db28..aa9d468850 100644
--- a/modules_v2/clippings/clippings_ctrl.php
+++ b/modules_v2/clippings/clippings_ctrl.php
@@ -1,39 +1,33 @@
 <?php
-/**
-* Controller for the Clippings Page
-*
-* webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
-* Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
-*
-* 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*
-* @package webtrees
-* @subpackage Charts
-* @version $Id$
-*/
+// Controller for the Clippings Page
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
 	exit;
 }
 
-define('WT_CLIPPINGS_CTRL', '');
-
 require_once WT_ROOT.'includes/functions/functions.php';
 require_once WT_ROOT.'library/pclzip.lib.php';
 
diff --git a/modules_v2/gedcom_favorites/db_schema/db_schema_0_1.php b/modules_v2/gedcom_favorites/db_schema/db_schema_0_1.php
index 5dff92e48a..eb660dd113 100644
--- a/modules_v2/gedcom_favorites/db_schema/db_schema_0_1.php
+++ b/modules_v2/gedcom_favorites/db_schema/db_schema_0_1.php
@@ -1,47 +1,43 @@
 <?php
-/**
- * Update the favorite module database schema from version 0 to version 1
- *
- * Version 0: empty database
- * Version 1: create the tables, as per PGV 4.2.1
- *
- * The script should assume that it can be interrupted at
- * any point, and be able to continue by re-running the script.
- * Fatal errors, however, should be allowed to throw exceptions,
- * which will be caught by the framework.
- * It shouldn't do anything that might take more than a few
- * seconds, for systems with low timeout values.
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2009 Greg Roach
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Id$
- */
+// Update the favorite module database schema from version 0 to version 1
+//
+// Version 0: empty database
+// Version 1: create the tables, as per PGV 4.2.1
+//
+// The script should assume that it can be interrupted at
+// any point, and be able to continue by re-running the script.
+// Fatal errors, however, should be allowed to throw exceptions,
+// which will be caught by the framework.
+// It shouldn't do anything that might take more than a few
+// seconds, for systems with low timeout values.
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2009 Greg Roach
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
-header('HTTP/1.0 403 Forbidden');
-exit;
+	header('HTTP/1.0 403 Forbidden');
+	exit;
 }
 
-define('WT_FV_DB_SCHEMA_0_1', '');
-
 WT_DB::exec(
 	"CREATE TABLE IF NOT EXISTS `##favorites` (".
 	" fv_id       INTEGER AUTO_INCREMENT NOT NULL,".
diff --git a/modules_v2/gedcom_news/db_schema/db_schema_0_1.php b/modules_v2/gedcom_news/db_schema/db_schema_0_1.php
index d588ba8e26..fa1e2314af 100644
--- a/modules_v2/gedcom_news/db_schema/db_schema_0_1.php
+++ b/modules_v2/gedcom_news/db_schema/db_schema_0_1.php
@@ -1,47 +1,43 @@
 <?php
-/**
- * Update the news/blog module database schema from version 0 to version 1
- *
- * Version 0: empty database
- * Version 1: create the tables, as per PGV 4.2.1
- *
- * The script should assume that it can be interrupted at
- * any point, and be able to continue by re-running the script.
- * Fatal errors, however, should be allowed to throw exceptions,
- * which will be caught by the framework.
- * It shouldn't do anything that might take more than a few
- * seconds, for systems with low timeout values.
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2009 Greg Roach
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Id$
- */
+// Update the news/blog module database schema from version 0 to version 1
+//
+// Version 0: empty database
+// Version 1: create the tables, as per PGV 4.2.1
+//
+// The script should assume that it can be interrupted at
+// any point, and be able to continue by re-running the script.
+// Fatal errors, however, should be allowed to throw exceptions,
+// which will be caught by the framework.
+// It shouldn't do anything that might take more than a few
+// seconds, for systems with low timeout values.
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2009 Greg Roach
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
-header('HTTP/1.0 403 Forbidden');
-exit;
+	header('HTTP/1.0 403 Forbidden');
+	exit;
 }
 
-define('WT_NB_DB_SCHEMA_0_1', '');
-
 WT_DB::exec(
 	"CREATE TABLE IF NOT EXISTS `##news` (".
 	" n_id       INTEGER AUTO_INCREMENT NOT NULL,".
diff --git a/modules_v2/googlemap/db_schema/db_schema_0_1.php b/modules_v2/googlemap/db_schema/db_schema_0_1.php
index 2dfbcda158..ef69f384f1 100644
--- a/modules_v2/googlemap/db_schema/db_schema_0_1.php
+++ b/modules_v2/googlemap/db_schema/db_schema_0_1.php
@@ -1,47 +1,43 @@
 <?php
-/**
- * Update the GM module database schema from version 0 to version 1
- *
- * Version 0: empty database
- * Version 1: create the tables, as per PGV 4.2.1
- *
- * The script should assume that it can be interrupted at
- * any point, and be able to continue by re-running the script.
- * Fatal errors, however, should be allowed to throw exceptions,
- * which will be caught by the framework.
- * It shouldn't do anything that might take more than a few
- * seconds, for systems with low timeout values.
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2009 Greg Roach
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Id$
- */
+// Update the GM module database schema from version 0 to version 1
+//
+// Version 0: empty database
+// Version 1: create the tables, as per PGV 4.2.1
+//
+// The script should assume that it can be interrupted at
+// any point, and be able to continue by re-running the script.
+// Fatal errors, however, should be allowed to throw exceptions,
+// which will be caught by the framework.
+// It shouldn't do anything that might take more than a few
+// seconds, for systems with low timeout values.
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2009 Greg Roach
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
-header('HTTP/1.0 403 Forbidden');
-exit;
+	header('HTTP/1.0 403 Forbidden');
+	exit;
 }
 
-define('WT_GM_DB_SCHEMA_0_1', '');
-
 // Create all of the tables needed for this module
 WT_DB::exec(
 	"CREATE TABLE IF NOT EXISTS `##placelocation` (".
diff --git a/modules_v2/googlemap/db_schema/db_schema_1_2.php b/modules_v2/googlemap/db_schema/db_schema_1_2.php
index 83c35bf4b9..45ca7fd7e0 100644
--- a/modules_v2/googlemap/db_schema/db_schema_1_2.php
+++ b/modules_v2/googlemap/db_schema/db_schema_1_2.php
@@ -1,48 +1,44 @@
 <?php
-/**
- * Update the GM module database schema from version 1 to version 2
- *
- * Version 0: empty database
- * Version 1: create the tables, as per PGV 4.2.1
- * Version 2: update the tables to support streetview
- *
- * The script should assume that it can be interrupted at
- * any point, and be able to continue by re-running the script.
- * Fatal errors, however, should be allowed to throw exceptions,
- * which will be caught by the framework.
- * It shouldn't do anything that might take more than a few
- * seconds, for systems with low timeout values.
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2011 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2009 Greg Roach
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Id$
- */
+// Update the GM module database schema from version 1 to version 2
+//
+// Version 0: empty database
+// Version 1: create the tables, as per PGV 4.2.1
+// Version 2: update the tables to support streetview
+//
+// The script should assume that it can be interrupted at
+// any point, and be able to continue by re-running the script.
+// Fatal errors, however, should be allowed to throw exceptions,
+// which will be caught by the framework.
+// It shouldn't do anything that might take more than a few
+// seconds, for systems with low timeout values.
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2009 Greg Roach
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
-header('HTTP/1.0 403 Forbidden');
-exit;
+	header('HTTP/1.0 403 Forbidden');
+	exit;
 }
 
-define('WT_GM_DB_SCHEMA_1_2', '');
-
 // Create all of the tables needed for this module
 //try {
 	WT_DB::exec(
diff --git a/modules_v2/googlemap/db_schema/db_schema_2_3.php b/modules_v2/googlemap/db_schema/db_schema_2_3.php
index bb416f6cfa..3309af8eb7 100644
--- a/modules_v2/googlemap/db_schema/db_schema_2_3.php
+++ b/modules_v2/googlemap/db_schema/db_schema_2_3.php
@@ -30,12 +30,10 @@
 // $Id$
 
 if (!defined('WT_WEBTREES')) {
-header('HTTP/1.0 403 Forbidden');
-exit;
+	header('HTTP/1.0 403 Forbidden');
+	exit;
 }
 
-define('WT_GM_DB_SCHEMA_2_3', '');
-
 WT_DB::exec("UPDATE `##placelocation` SET pl_icon=REPLACE(pl_icon, '.gif', '.png')");
 
 // Update the version to indicate success
diff --git a/modules_v2/googlemap/db_schema/db_schema_3_4.php b/modules_v2/googlemap/db_schema/db_schema_3_4.php
index 338eae10c8..b54b57d683 100644
--- a/modules_v2/googlemap/db_schema/db_schema_3_4.php
+++ b/modules_v2/googlemap/db_schema/db_schema_3_4.php
@@ -30,12 +30,10 @@
 // $Id$
 
 if (!defined('WT_WEBTREES')) {
-header('HTTP/1.0 403 Forbidden');
-exit;
+	header('HTTP/1.0 403 Forbidden');
+	exit;
 }
 
-define('WT_GM_DB_SCHEMA_3_4', '');
-
 self::exec(
 	"UPDATE `##module` m, `##module_setting` ms SET m.status=CASE WHEN (m.status=1 AND ms.setting_value=1) THEN 'enabled' ELSE 'disabled' END WHERE m.module_name=ms.module_name AND m.module_name='googlemap' AND ms.setting_name='GM_ENABLED'"
 );
diff --git a/modules_v2/user_blog/db_schema/db_schema_0_1.php b/modules_v2/user_blog/db_schema/db_schema_0_1.php
index d588ba8e26..fa1e2314af 100644
--- a/modules_v2/user_blog/db_schema/db_schema_0_1.php
+++ b/modules_v2/user_blog/db_schema/db_schema_0_1.php
@@ -1,47 +1,43 @@
 <?php
-/**
- * Update the news/blog module database schema from version 0 to version 1
- *
- * Version 0: empty database
- * Version 1: create the tables, as per PGV 4.2.1
- *
- * The script should assume that it can be interrupted at
- * any point, and be able to continue by re-running the script.
- * Fatal errors, however, should be allowed to throw exceptions,
- * which will be caught by the framework.
- * It shouldn't do anything that might take more than a few
- * seconds, for systems with low timeout values.
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2009 Greg Roach
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Id$
- */
+// Update the news/blog module database schema from version 0 to version 1
+//
+// Version 0: empty database
+// Version 1: create the tables, as per PGV 4.2.1
+//
+// The script should assume that it can be interrupted at
+// any point, and be able to continue by re-running the script.
+// Fatal errors, however, should be allowed to throw exceptions,
+// which will be caught by the framework.
+// It shouldn't do anything that might take more than a few
+// seconds, for systems with low timeout values.
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2009 Greg Roach
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
-header('HTTP/1.0 403 Forbidden');
-exit;
+	header('HTTP/1.0 403 Forbidden');
+	exit;
 }
 
-define('WT_NB_DB_SCHEMA_0_1', '');
-
 WT_DB::exec(
 	"CREATE TABLE IF NOT EXISTS `##news` (".
 	" n_id       INTEGER AUTO_INCREMENT NOT NULL,".
diff --git a/modules_v2/user_favorites/db_schema/db_schema_0_1.php b/modules_v2/user_favorites/db_schema/db_schema_0_1.php
index 5dff92e48a..eb660dd113 100644
--- a/modules_v2/user_favorites/db_schema/db_schema_0_1.php
+++ b/modules_v2/user_favorites/db_schema/db_schema_0_1.php
@@ -1,47 +1,43 @@
 <?php
-/**
- * Update the favorite module database schema from version 0 to version 1
- *
- * Version 0: empty database
- * Version 1: create the tables, as per PGV 4.2.1
- *
- * The script should assume that it can be interrupted at
- * any point, and be able to continue by re-running the script.
- * Fatal errors, however, should be allowed to throw exceptions,
- * which will be caught by the framework.
- * It shouldn't do anything that might take more than a few
- * seconds, for systems with low timeout values.
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2009 Greg Roach
- *
- * 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Id$
- */
+// Update the favorite module database schema from version 0 to version 1
+//
+// Version 0: empty database
+// Version 1: create the tables, as per PGV 4.2.1
+//
+// The script should assume that it can be interrupted at
+// any point, and be able to continue by re-running the script.
+// Fatal errors, however, should be allowed to throw exceptions,
+// which will be caught by the framework.
+// It shouldn't do anything that might take more than a few
+// seconds, for systems with low timeout values.
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2009 Greg Roach
+//
+// 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 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
-header('HTTP/1.0 403 Forbidden');
-exit;
+	header('HTTP/1.0 403 Forbidden');
+	exit;
 }
 
-define('WT_FV_DB_SCHEMA_0_1', '');
-
 WT_DB::exec(
 	"CREATE TABLE IF NOT EXISTS `##favorites` (".
 	" fv_id       INTEGER AUTO_INCREMENT NOT NULL,".