Index: trunk/core/kernel/startup.php
===================================================================
diff -u -N -r7391 -r7855
--- trunk/core/kernel/startup.php	(.../startup.php)	(revision 7391)
+++ trunk/core/kernel/startup.php	(.../startup.php)	(revision 7855)
@@ -31,8 +31,8 @@
 
 	$vars = parse_portal_ini(FULL_PATH.'/config.php');
 
-	define('APPLICATION_CLASS', isset($vars['ApplicationClass']) ? $vars['ApplicationClass'] : 'kApplication');
-	define('APPLICATION_PATH', isset($vars['ApplicationPath']) ? $vars['ApplicationPath'] : '/core/kernel/application.php');
+	safeDefine('APPLICATION_CLASS', isset($vars['ApplicationClass']) ? $vars['ApplicationClass'] : 'kApplication');
+	safeDefine('APPLICATION_PATH', isset($vars['ApplicationPath']) ? $vars['ApplicationPath'] : '/core/kernel/application.php');
 
 	if (isset($vars['WriteablePath'])) {
 		define('WRITEABLE', FULL_PATH.$vars['WriteablePath']);
@@ -85,8 +85,8 @@
 			include_once(KERNEL_PATH.'/utility/debugger.php');
 			$debugger_end = getmicrotime();
 			if (isset($debugger) && constOn('DBG_PROFILE_INCLUDES')) {
-//				$debugger->profileStart('inc_globals', KERNEL_PATH.'/globals.php', $globals_start);
-//				$debugger->profileFinish('inc_globals', KERNEL_PATH.'/globals.php', $globals_end);
+				$debugger->profileStart('inc_globals', KERNEL_PATH.'/globals.php', $globals_start);
+				$debugger->profileFinish('inc_globals', KERNEL_PATH.'/globals.php', $globals_end);
 				$debugger->profilerAddTotal('includes', 'inc_globals');
 
 				$debugger->profileStart('inc_debugger', KERNEL_PATH.'/utility/debugger.php', $debugger_start);