diff --git a/phpgwapi/inc/class.linkbox.inc.php b/phpgwapi/inc/class.linkbox.inc.php
index 7d2d1ed668..58be4d63c5 100644
--- a/phpgwapi/inc/class.linkbox.inc.php
+++ b/phpgwapi/inc/class.linkbox.inc.php
@@ -25,10 +25,9 @@
   /* $Id$ */
 
   /* $Id$ */
-if (!$phpgw_info["flags"]["included_classes"]["portalbox"]){
-  $phpgw_info["flags"]["included_classes"]["portalbox"] = True;
-  include($phpgw_info["server"]["include_root"]."/".$appname."/inc/class.portalbox.inc.php");
-}
+
+CreateObject('phpgwapi.portalbox');
+
 class linkbox extends portalbox { 
     /* 
          Set up the Object. You will notice, we have not reserved  
diff --git a/phpgwapi/inc/class.resultbox.inc.php b/phpgwapi/inc/class.resultbox.inc.php
index 32129b0c73..3c45d38cce 100644
--- a/phpgwapi/inc/class.resultbox.inc.php
+++ b/phpgwapi/inc/class.resultbox.inc.php
@@ -24,10 +24,8 @@
 
   /* $Id$ */
 
-if (!$phpgw_info["flags"]["included_classes"]["portalbox"]){
-  $phpgw_info["flags"]["included_classes"]["portalbox"] = True;
-  include($phpgw_info["server"]["include_root"]."/".$appname."/inc/class.portalbox.inc.php");
-}
+CreateObject('phpgwapi.portalbox');
+
 class resultbox extends portalbox { 
     /* 
         Set up the Object. You will notice, we have not reserved memory