diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
index 05799d502b..ffe7e0d756 100644
--- a/phpBB/docs/AUTHORS
+++ b/phpBB/docs/AUTHORS
@@ -6,7 +6,7 @@
 /*                                                                        *\
 /* ********************************************************************** *\
 
-Please see: http://www.phpbb.com/about.php for a list of all the people involved in phpBB.
+Please see: http://www.phpbb.com/about/ for a list of all the people involved in phpBB.
 Original subSilver by subBlue Design, Tom Beddard, © 2001 phpBB Group
 
 phpBB3 contains code from the following applications:
diff --git a/phpBB/includes/acm/acm_main.php b/phpBB/includes/acm/acm_main.php
index a8630ea43a..8a492276c7 100644
--- a/phpBB/includes/acm/acm_main.php
+++ b/phpBB/includes/acm/acm_main.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @package acm
 * Class for grabbing/handling cached entries, extends acm_file or acm_db depending on the setup
diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php
index 73427a92f4..928f3b7dca 100644
--- a/phpBB/includes/acp/auth.php
+++ b/phpBB/includes/acp/auth.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @package phpBB3
 * ACP Permission/Auth class
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index 416321f1bc..9ee3fcc171 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @ignore
 */
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
index 92e1974f1a..0e30a2670a 100644
--- a/phpBB/includes/db/mssql.php
+++ b/phpBB/includes/db/mssql.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @ignore
 */
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index 55eeddb310..e87cc707f4 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @ignore
 */
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index ab02fc7746..625c6876ee 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @ignore
 */
diff --git a/phpBB/includes/db/mysql4.php b/phpBB/includes/db/mysql4.php
index 0a7d15b988..c388987e40 100644
--- a/phpBB/includes/db/mysql4.php
+++ b/phpBB/includes/db/mysql4.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @ignore
 */
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index 201d6af1e7..3b0abe8e81 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @ignore
 */
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index e7e75b9c7c..7de1de37c3 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @ignore
 */
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index 75d83aecd6..e09793bdaa 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @ignore
 */
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index d10fbc486b..e7ea150a43 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @ignore
 */
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 800f6a9620..7921e0a187 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -10,6 +10,10 @@
 
 /**
 */
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
 
 /*
 	Ability to simply add own rules by doing three things:
diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php
index 96d0bf740b..51e9d7564c 100644
--- a/phpBB/includes/functions_template.php
+++ b/phpBB/includes/functions_template.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @package phpBB3
 *
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 28f4064aef..bfdc61a9c6 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @ignore
 */
diff --git a/phpBB/includes/search/fulltext_phpbb.php b/phpBB/includes/search/fulltext_phpbb.php
index a1baecc2d2..4403c92c46 100644
--- a/phpBB/includes/search/fulltext_phpbb.php
+++ b/phpBB/includes/search/fulltext_phpbb.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @ignore
 */
diff --git a/phpBB/includes/search/search.php b/phpBB/includes/search/search.php
index 7a8a5ac1c3..16d87947d2 100755
--- a/phpBB/includes/search/search.php
+++ b/phpBB/includes/search/search.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @ignore
 */
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index b592181a35..fc03298c6c 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -8,6 +8,13 @@
 *
 */
 
+/**
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 /**
 * @package phpBB3
 *