diff --git a/lib/documentmanagement/Document.inc b/lib/documentmanagement/Document.inc
index 41c2192..7c1c613 100644
--- a/lib/documentmanagement/Document.inc
+++ b/lib/documentmanagement/Document.inc
@@ -4,7 +4,10 @@ DEFINE("LIVE", 1);
 DEFINE("PUBLISHED", 2);
 DEFINE("DELETED", 3);
 DEFINE("ARCHIVED", 4);
-require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
+DEFINE("STATUS_INCOMPLETE", 5);
+
+require_once(KT_LIB_DIR . "/foldermanagement/Folder.inc");
+
 /**
  * $Id$
  *
@@ -31,6 +34,7 @@ require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
  * @package lib.documentmanagement
  * @todo add in document change transaction functionality
  */ 
+
 class Document extends KTEntity {
     /** primary key */
     var $iId;
diff --git a/lib/foldermanagement/Folder.inc b/lib/foldermanagement/Folder.inc
index 22d6a27..f94ef58 100644
--- a/lib/foldermanagement/Folder.inc
+++ b/lib/foldermanagement/Folder.inc
@@ -24,8 +24,8 @@
  * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
  * @package lib.foldermanagement 
  */
-require_once("$default->fileSystemRoot/lib/foldermanagement/PhysicalFolderManagement.inc");
-require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
+require_once(KT_LIB_DIR . "/foldermanagement/PhysicalFolderManagement.inc");
+require_once(KT_LIB_DIR . "/lib/documentmanagement/Document.inc");
 
 class Folder extends KTEntity {
 	
diff --git a/lib/upgrades/UpgradeFunctions.inc.php b/lib/upgrades/UpgradeFunctions.inc.php
index 107f99b..9d52309 100644
--- a/lib/upgrades/UpgradeFunctions.inc.php
+++ b/lib/upgrades/UpgradeFunctions.inc.php
@@ -11,6 +11,7 @@ class UpgradeFunctions {
         "addTemplateMimeTypes" => "Add MIME types for Excel and Word templates",
     );
     function setPermissionFolder() {
+        global $default;
         require_once(KT_LIB_DIR . '/foldermanagement/Folder.inc');
 
         $sQuery = "SELECT id FROM $default->folders_table WHERE permission_folder_id = NULL";