diff --git a/phpBB/common.php b/phpBB/common.php
index 88577c6971..9564ffa605 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -82,6 +82,9 @@ function deregister_globals()
 // If we are on PHP >= 6.0.0 we do not need some code
 if (version_compare(phpversion(), '6.0.0-dev', '>='))
 {
+	/**
+	* @ignore
+	*/
 	define('STRIP', false);
 }
 else
diff --git a/phpBB/download.php b/phpBB/download.php
index 9d2efdf9df..f6a43b24c6 100644
--- a/phpBB/download.php
+++ b/phpBB/download.php
@@ -9,6 +9,7 @@
 */
 
 /**
+* @ignore
 */
 define('IN_PHPBB', true);
 $phpbb_root_path = './';
diff --git a/phpBB/faq.php b/phpBB/faq.php
index d51f78d5af..d246052eff 100644
--- a/phpBB/faq.php
+++ b/phpBB/faq.php
@@ -9,6 +9,7 @@
 */
 
 /**
+* @ignore
 */
 define('IN_PHPBB', true);
 $phpbb_root_path = './';
diff --git a/phpBB/includes/acm/acm_db.php b/phpBB/includes/acm/acm_db.php
index 83f52362cd..00fa21430d 100644
--- a/phpBB/includes/acm/acm_db.php
+++ b/phpBB/includes/acm/acm_db.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package acm_db
+* @package acm
 * @version $Id$
 * @copyright (c) 2005 phpBB Group 
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License 
@@ -9,7 +9,8 @@
 */
 
 /**
-* @package acm_db
+* @package acm
+* @ignore
 * ACM Database Caching
 */
 class acm
diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php
index 42db254567..c3567e05a4 100644
--- a/phpBB/includes/acm/acm_file.php
+++ b/phpBB/includes/acm/acm_file.php
@@ -1,7 +1,7 @@
 <?php
 /** 
 *
-* @package acm_file
+* @package acm
 * @version $Id$
 * @copyright (c) 2005 phpBB Group 
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License 
@@ -9,7 +9,7 @@
 */
 
 /**
-* @package acm_file
+* @package acm
 * ACM File Based Caching
 */
 class acm
diff --git a/phpBB/includes/captcha/captcha_gd.php b/phpBB/includes/captcha/captcha_gd.php
index 4bf7369c58..d49505442c 100644
--- a/phpBB/includes/captcha/captcha_gd.php
+++ b/phpBB/includes/captcha/captcha_gd.php
@@ -1352,7 +1352,6 @@ class char_cube3d
 }
 
 /**
-* @package VC
 * Return bitmaps
 */
 function captcha_bitmaps()
@@ -1962,7 +1961,6 @@ function captcha_bitmaps()
 
 /**
 * Return vectors
-* @package VC
 */
 function captcha_vectors()
 {
diff --git a/phpBB/index.php b/phpBB/index.php
index 9f180a5216..4795d14072 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -9,6 +9,7 @@
 */
 
 /**
+* @ignore
 */
 define('IN_PHPBB', true);
 $phpbb_root_path = './';
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 99bde17803..530fae7bf2 100755
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -77,6 +77,9 @@ function deregister_globals()
 // If we are on PHP >= 6.0.0 we do not need some code
 if (version_compare(phpversion(), '6.0.0-dev', '>='))
 {
+	/**
+	* @ignore
+	*/
 	define('STRIP', false);
 }
 else
@@ -186,6 +189,7 @@ $template->set_filenames(array(
 $install->page_footer();
 
 /**
+* @package install
 */
 class module
 {
@@ -441,7 +445,7 @@ class module
 	/**
 	* Output an error message
 	* If skip is true, return and continue execution, else exit
-	* @todo: Really should change the caption based on $skip and calling code at some point
+	* @todo Really should change the caption based on $skip and calling code at some point
 	*/
 	function error($error, $line, $file, $skip = false)
 	{
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index bbc88fb320..7f5f4e6177 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -24,6 +24,10 @@ if (!empty($setmodules))
 	);
 }
 
+/**
+* @package install
+* Installation
+*/
 class install_install extends module
 {
 	function install_install(&$p_master)
diff --git a/phpBB/install/install_main.php b/phpBB/install/install_main.php
index ce81df92db..d399c36ec1 100755
--- a/phpBB/install/install_main.php
+++ b/phpBB/install/install_main.php
@@ -24,6 +24,10 @@ if (!empty($setmodules))
 	);
 }
 
+/**
+* @package install
+* Main Tab - Installation
+*/
 class install_main extends module
 {
 	function install_main(&$p_master)
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 99ba5fd8f5..f4f4284e36 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -9,6 +9,7 @@
 */
 
 /**
+* @ignore
 */
 define('IN_PHPBB', true);
 $phpbb_root_path = './';
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 09b4ddeca3..02feb7ba1a 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -9,6 +9,7 @@
 */
 
 /**
+* @ignore
 */
 define('IN_PHPBB', true);
 $phpbb_root_path = './';
diff --git a/phpBB/report.php b/phpBB/report.php
index 236b7008e4..29998c2a97 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -9,6 +9,7 @@
 */
 
 /**
+* @ignore
 */
 define('IN_PHPBB', true);
 $phpbb_root_path = './';
diff --git a/phpBB/search.php b/phpBB/search.php
index 2095bc1e70..4bb233872a 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -9,6 +9,7 @@
 */
 
 /**
+* @ignore
 */
 define('IN_PHPBB', true);
 $phpbb_root_path = './';
diff --git a/phpBB/style.php b/phpBB/style.php
index 813e39e865..ad799033e9 100644
--- a/phpBB/style.php
+++ b/phpBB/style.php
@@ -9,6 +9,7 @@
 */
 
 /**
+* @ignore
 */
 define('IN_PHPBB', true);
 $phpbb_root_path = './';
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 8e178537b3..95e2d55b78 100755
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -9,6 +9,7 @@
 */
 
 /**
+* @ignore
 */
 define('IN_PHPBB', true);
 $phpbb_root_path = './';
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index fff49c9620..bf2eea2b2a 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -9,6 +9,7 @@
 */
 
 /**
+* @ignore
 */
 define('IN_PHPBB', true);
 $phpbb_root_path = './';
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index 8dd611de6c..35244b6613 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -9,6 +9,7 @@
 */
 
 /**
+* @ignore
 */
 define('IN_PHPBB', true);
 $phpbb_root_path = './';
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index f7f3e81217..9ff1b4bd48 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -9,6 +9,7 @@
 */
 
 /**
+* @ignore
 */
 define('IN_PHPBB', true);
 $phpbb_root_path = './';