Index: trunk/core/kernel/startup.php
===================================================================
diff -u -r4135 -r4758
--- trunk/core/kernel/startup.php	(.../startup.php)	(revision 4135)
+++ trunk/core/kernel/startup.php	(.../startup.php)	(revision 4758)
@@ -1,7 +1,9 @@
 <?php
 
 	define('KERNEL_PATH', FULL_PATH.'/kernel/kernel4');
+	$globals_start = getmicrotime();
 	include_once(KERNEL_PATH.'/globals.php');	// non OOP functions used through kernel, e.g. print_pre
+	$globals_end = getmicrotime();
 
 	if( constOn('ADMIN') ) define('SPECIAL_TEMPLATES_FOLDER', '/kernel/admin_templates');
 
@@ -49,17 +51,6 @@
 
 	safeDefine('ENV_VAR_NAME','env');
 
-	k4_include_once(KERNEL_PATH.'/application.php');
-	k4_include_once(MODULES_PATH.'/kernel/units/general/my_application.php');
-
-	if( file_exists(FULL_PATH.'/debug.php') )
-	{
-		k4_include_once(FULL_PATH.'/debug.php');
-		if( constOn('DEBUG_MODE') ) include_once(KERNEL_PATH.'/utility/debugger.php');
-	}
-
-	k4_include_once(KERNEL_PATH.'/db/db_connection.php');
-
 	safeDefine('IMAGES_PATH', '/kernel/images/');
 	safeDefine('IMAGES_PENDING_PATH', IMAGES_PATH.'pending/');
 	safeDefine('CUSTOM_UPLOAD_PATH', '/templates/images/custom/');
@@ -71,24 +62,52 @@
 	safeDefine('EXPERIMENTAL_PRE_PARSE', 1);
 	safeDefine('SILENT_LOG', 0);
 
-	k4_include_once(KERNEL_PATH."/kbase.php");
-	k4_include_once(KERNEL_PATH.'/utility/event.php');
-	k4_include_once(KERNEL_PATH."/utility/factory.php");
-	k4_include_once(KERNEL_PATH."/languages/phrases_cache.php");
-	if( !function_exists('adodb_mktime') ) k4_include_once(KERNEL_PATH.'/utility/adodb-time.inc.php');
+	if( file_exists(FULL_PATH.'/debug.php') )
+	{
+		include_once(FULL_PATH.'/debug.php');
+		if( constOn('DEBUG_MODE') ) {
+			$debugger_start = getmicrotime();
+			include_once(KERNEL_PATH.'/utility/debugger.php');
+			$debugger_end = getmicrotime();
 
-	// We should get rid of these includes:
-	k4_include_once(KERNEL_PATH."/db/dblist.php");
-	k4_include_once(KERNEL_PATH."/db/dbitem.php");
+			$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');
 
-	k4_include_once(KERNEL_PATH.'/processors/tag_processor.php');
-	k4_include_once(KERNEL_PATH."/db/db_tag_processor.php");
+			$debugger->profileStart('inc_debugger', KERNEL_PATH.'/utility/debugger.php', $debugger_start);
+			$debugger->profileFinish('inc_debugger', KERNEL_PATH.'/utility/debugger.php', $debugger_end);
+			$debugger->profilerAddTotal('includes', 'inc_debugger');
+		}
+	}
 
-	k4_include_once(KERNEL_PATH."/event_handler.php");
-	k4_include_once(KERNEL_PATH.'/db/db_event_handler.php');
-	k4_include_once(MODULES_PATH.'/kernel/units/general/inp_db_event_handler.php');
+	$includes = Array(
+			KERNEL_PATH.'/application.php',
+			MODULES_PATH.'/kernel/units/general/my_application.php',
+			KERNEL_PATH.'/db/db_connection.php',
+			KERNEL_PATH."/kbase.php",
+			KERNEL_PATH.'/utility/event.php',
+			KERNEL_PATH."/utility/factory.php",
+			KERNEL_PATH."/languages/phrases_cache.php",
+			KERNEL_PATH."/db/dblist.php",
+			KERNEL_PATH."/db/dbitem.php",
+//			KERNEL_PATH.'/processors/tag_processor.php',
+//			KERNEL_PATH."/db/db_tag_processor.php",
+			KERNEL_PATH."/event_handler.php",
+			KERNEL_PATH.'/db/db_event_handler.php',
+			MODULES_PATH.'/kernel/units/general/inp_db_event_handler.php',
+	);
 
-	k4_include_once(KERNEL_PATH."/utility/temp_handler.php"); // needed because of static calls from kBase
+	foreach ($includes as $a_file) {
+		k4_include_once($a_file);
+	}
+
+	if (defined('DEBUG_MODE') && DEBUG_MODE) {
+		$debugger->AttachToApplication();
+	}
+
+	if( !function_exists('adodb_mktime') ) include_once(KERNEL_PATH.'/utility/adodb-time.inc.php');
+
+//	include_once(KERNEL_PATH."/utility/temp_handler.php"); // needed because of static calls from kBase
 	// up to here
 
 	// global constants