diff --git a/Puc/v4p10/DebugBar/Extension.php b/Puc/v4p10/DebugBar/Extension.php
index e67460b..e3e6db7 100644
--- a/Puc/v4p10/DebugBar/Extension.php
+++ b/Puc/v4p10/DebugBar/Extension.php
@@ -14,11 +14,7 @@ if ( !class_exists('Puc_v4p10_DebugBar_Extension', false) ):
 				$this->panelClass = $panelClass;
 			}
 
-			if (
-				defined('__NAMESPACE__')
-				&& version_compare(PHP_VERSION, '5.3', '>=')
-				&& (strpos($this->panelClass, '\\') === false)
-			) {
+			if ( version_compare(PHP_VERSION, '5.3', '>=') && (strpos($this->panelClass, '\\') === false) ) {
 				$this->panelClass = __NAMESPACE__ . '\\' . $this->panelClass;
 			}
 
diff --git a/Puc/v4p10/Factory.php b/Puc/v4p10/Factory.php
index e61ee28..01ed848 100644
--- a/Puc/v4p10/Factory.php
+++ b/Puc/v4p10/Factory.php
@@ -112,7 +112,7 @@ if ( !class_exists('Puc_v4p10_Factory', false) ):
 			}
 
 			//Add the current namespace to the class name(s).
-			if ( defined('__NAMESPACE__') && version_compare(PHP_VERSION, '5.3', '>=') ) {
+			if ( version_compare(PHP_VERSION, '5.3', '>=') ) {
 				$checkerClass = __NAMESPACE__ . '\\' . $checkerClass;
 				if ( isset($apiClass) ) {
 					$apiClass = __NAMESPACE__ . '\\' . $apiClass;