diff --git a/phpBB/includes/captcha/captcha_factory.php b/phpBB/includes/captcha/captcha_factory.php
old mode 100755
new mode 100644
index e6f56172ec..fbe615a043
--- a/phpBB/includes/captcha/captcha_factory.php
+++ b/phpBB/includes/captcha/captcha_factory.php
@@ -1,8 +1,8 @@
-<?
+<?php
 /**
 *
 * @package VC
-* @version $Id: $
+* @version $Id$
 * @copyright (c) 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
@@ -89,4 +89,6 @@ class phpbb_captcha_factory
 
 		return $captchas;
 	}
-}
\ No newline at end of file
+}
+
+?>
\ No newline at end of file
diff --git a/phpBB/includes/captcha/captcha_gd_wave.php b/phpBB/includes/captcha/captcha_gd_wave.php
old mode 100755
new mode 100644
index 0356538a4d..41dfcdd9d4
--- a/phpBB/includes/captcha/captcha_gd_wave.php
+++ b/phpBB/includes/captcha/captcha_gd_wave.php
@@ -2,15 +2,15 @@
 /** 
 *
 * @package VC
-* @version $Id: captcha_gd.php,v 1.19 2007/01/26 16:07:43 acydburn Exp $
+* @version $Id$
 * @copyright (c) 2006 phpBB Group 
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License 
 *
 */
-
-
-/** 
-Wave3D CAPTCHA by Robert Hetzler
+
+
+/** 
+* Wave3D CAPTCHA by Robert Hetzler
 */
 class captcha
 {
@@ -836,7 +836,7 @@ class captcha
 				),
 			)
 		);
-	}
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/phpBB/includes/captcha/captcha_plugin.php b/phpBB/includes/captcha/captcha_plugin.php
old mode 100755
new mode 100644
index 08a149764c..7c601caa93
--- a/phpBB/includes/captcha/captcha_plugin.php
+++ b/phpBB/includes/captcha/captcha_plugin.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 interface phpbb_captcha_plugin
 {
@@ -94,4 +94,6 @@ interface phpbb_captcha_plugin
 	*/
 	function get_attempt_count();
 
-}
\ No newline at end of file
+}
+
+?>
\ No newline at end of file
diff --git a/phpBB/includes/captcha/plugins/captcha_abstract.php b/phpBB/includes/captcha/plugins/captcha_abstract.php
old mode 100755
new mode 100644
index f5c135dc74..f88d82b2a0
--- a/phpBB/includes/captcha/plugins/captcha_abstract.php
+++ b/phpBB/includes/captcha/plugins/captcha_abstract.php
@@ -1,9 +1,9 @@
-<?
+<?php
 /**
 *
 * @package VC
-* @version $Id: $
-* @copyright (c) 2006 2008 phpBB Group
+* @version $Id$
+* @copyright (c) 2006, 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
@@ -330,3 +330,4 @@ class phpbb_default_captcha
 	
 }
 
+?>
\ No newline at end of file
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
old mode 100755
new mode 100644
index 850794e133..5b3c09f32d
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
@@ -1,12 +1,13 @@
-<?
+<?php
 /**
 *
 * @package VC
-* @version $Id: $
-* @copyright (c) 2006 2008 phpBB Group
+* @version $Id$
+* @copyright (c) 2006, 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
+
 /**
 * @ignore
 */
@@ -20,18 +21,18 @@ if (!defined('IN_PHPBB'))
 */
 if (!class_exists('phpbb_default_captcha'))
 {
-	include_once($phpbb_root_path . "includes/captcha/plugins/captcha_abstract." . $phpEx);
+	include($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
 }
 
 class phpbb_captcha_gd extends phpbb_default_captcha
 {
-
 	function phpbb_captcha_gd()
 	{
 		global $phpbb_root_path, $phpEx;
+
 		if (!class_exists('captcha'))
 		{
-			include_once($phpbb_root_path . "includes/captcha/captcha_gd." . $phpEx);
+			include($phpbb_root_path . 'includes/captcha/captcha_gd.' . $phpEx);
 		}
 	}
 	
@@ -120,3 +121,4 @@ class phpbb_captcha_gd extends phpbb_default_captcha
 	}
 }
 
+?>
\ No newline at end of file
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
old mode 100755
new mode 100644
index 769867655c..38e5aabedd
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_gd_wave_plugin.php
@@ -3,10 +3,11 @@
 *
 * @package VC
 * @version $Id$
-* @copyright (c) 2006 2008 phpBB Group
+* @copyright (c) 2006, 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
+
 /**
 * @ignore
 */
@@ -29,6 +30,7 @@ class phpbb_captcha_gd_wave extends phpbb_default_captcha
 	function phpbb_captcha_gd_wave()
 	{
 		global $phpbb_root_path, $phpEx;
+
 		if (!class_exists('captcha'))
 		{
 			include_once($phpbb_root_path . 'includes/captcha/captcha_gd_wave.' . $phpEx);
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
old mode 100755
new mode 100644
index c5a32137d7..8df11bfe8a
--- a/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_captcha_nogd_plugin.php
@@ -1,12 +1,13 @@
-<?
+<?php
 /**
 *
 * @package VC
-* @version $Id: $
-* @copyright (c) 2006 2008 phpBB Group
+* @version $Id$
+* @copyright (c) 2006, 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
+
 /**
 * @ignore
 */
@@ -20,7 +21,7 @@ if (!defined('IN_PHPBB'))
 */
 if (!class_exists('phpbb_default_captcha'))
 {
-	include_once($phpbb_root_path . "includes/captcha/plugins/captcha_abstract." . $phpEx);
+	include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
 }
 
 class phpbb_captcha_nogd extends phpbb_default_captcha
@@ -29,9 +30,10 @@ class phpbb_captcha_nogd extends phpbb_default_captcha
 	function phpbb_captcha_nogd()
 	{
 		global $phpbb_root_path, $phpEx;
+
 		if (!class_exists('captcha'))
 		{
-			include_once($phpbb_root_path . "includes/captcha/captcha_non_gd." . $phpEx);
+			include_once($phpbb_root_path . 'includes/captcha/captcha_non_gd.' . $phpEx);
 		}
 	}
 	
diff --git a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
index 7a3c406324..42ca25ae54 100644
--- a/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
+++ b/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
@@ -1,9 +1,9 @@
-<?
+<?php
 /**
 *
 * @package VC
-* @version $Id: $
-* @copyright (c) 2006 2008 phpBB Group
+* @version $Id$
+* @copyright (c) 2006, 2008 phpBB Group
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 if (!class_exists('phpbb_default_captcha'))
 {
 	// we need the classic captcha code for tracking solutions and attempts
-	include_once($phpbb_root_path . "includes/captcha/plugins/captcha_abstract." . $phpEx);
+	include_once($phpbb_root_path . 'includes/captcha/plugins/captcha_abstract.' . $phpEx);
 }
 
 class phpbb_recaptcha extends phpbb_default_captcha