diff --git a/addressbook/inc/hook_home.inc.php b/addressbook/inc/hook_home.inc.php
index 8969d8a78a..8b1245c5c6 100644
--- a/addressbook/inc/hook_home.inc.php
+++ b/addressbook/inc/hook_home.inc.php
@@ -19,9 +19,6 @@
 	}
 	unset($d1);
 
-	$tmp_app_inc = PHPGW_APP_INC;
-	define('PHPGW_APP_INC',$phpgw->common->get_inc_dir('addressbook'));
-
 	if ($phpgw_info['user']['apps']['addressbook']
 		&& $phpgw_info['user']['preferences']['addressbook']['mainscreen_showbirthdays'])
 	{
@@ -59,6 +56,4 @@
 		}
 		echo "\n<!-- Birthday info -->\n";
 	}
-
-	define('PHPGW_APP_INC',$tmp_app_inc);
 ?>
diff --git a/calendar/inc/hook_home.inc.php b/calendar/inc/hook_home.inc.php
index aed3024f62..329adc5ae7 100755
--- a/calendar/inc/hook_home.inc.php
+++ b/calendar/inc/hook_home.inc.php
@@ -22,13 +22,12 @@
 	}
 	unset($d1);
 
-	$tmp_app_inc = PHPGW_APP_INC;
-	define('PHPGW_APP_INC',$phpgw->common->get_inc_dir('calendar'));
+	$tmp_app_inc = $phpgw->common->get_inc_dir('calendar');
 
 	if ($phpgw_info['user']['preferences']['calendar']['mainscreen_showevents'])
 	{
-		include(PHPGW_APP_INC . '/functions.inc.php');
-		echo "\n".'<tr valign="top"><td><table border="0" cols="3"><tr><td align="center" width="35%" valign="top"><!-- Calendar info -->'."\n";
+		include($tmp_app_inc . '/functions.inc.php');
+		echo "\n".'<tr valign="top"><td><table border="0" cols="3"><tr><td align="center" width="35%" valign="top"><!-- BEGIN Calendar info -->'."\n";
 		echo $phpgw->calendar->mini_calendar($phpgw->calendar->today["day"],$phpgw->calendar->today["month"],$phpgw->calendar->today["year"],"day.php").'</td><td align="center">';
 		echo '<table border="0" width="100%" cellspacing="0" cellpadding="0"><tr><td align="center">'
 			. lang(date("F",$phpgw->calendar->today["raw"])).' '.$phpgw->calendar->today["day"].', '.$phpgw->calendar->today["year"].'</tr></td>'
@@ -38,9 +37,7 @@
 		$now['raw'] += $phpgw->calendar->datetime->tz_offset;
 		echo $phpgw->calendar->print_day_at_a_glance($now).'</td></tr></table>'."\n";
 //		$phpgw->calendar->printer_friendly = False;
-		echo "\n".'<!-- Calendar info --></table></td></tr>'."\n";
+		echo "\n".'<!-- END Calendar info --></table></td></tr>'."\n";
 		unset($phpgw->calendar);
 	} 
-
-	define('PHPGW_APP_INC',$tmp_app_inc);
 ?>