diff --git a/api/src/Contacts/Ldap.php b/api/src/Contacts/Ldap.php
index 7cadce7f24..54456664fb 100644
--- a/api/src/Contacts/Ldap.php
+++ b/api/src/Contacts/Ldap.php
@@ -16,9 +16,6 @@ namespace EGroupware\Api\Contacts;
 
 use EGroupware\Api;
 
-// explicitly reference classes still in phpgwapi
-use common;	// randomstring
-
 /**
  * LDAP Backend for contacts, compatible with vars and parameters of eTemplate's so_sql.
  * Maybe one day this becomes a generalized ldap storage object :-)
@@ -514,7 +511,7 @@ class Ldap
 
 		if(empty($contactUID))
 		{
-			$ldapContact[$this->dn_attribute] = $this->data[$this->contacts_id] = $contactUID = md5(common::randomstring(15));
+			$ldapContact[$this->dn_attribute] = $this->data[$this->contacts_id] = $contactUID = md5(Api\Auth::randomstring(15));
 		}
 		//error_log(__METHOD__."() contactUID='$contactUID', isUpdate=".array2string($isUpdate).", oldContactInfo=".array2string($oldContactInfo));
 		// add for all supported objectclasses the objectclass and it's attributes
diff --git a/api/src/Storage/Tracking.php b/api/src/Storage/Tracking.php
index 7a747fe33a..b75d85122a 100644
--- a/api/src/Storage/Tracking.php
+++ b/api/src/Storage/Tracking.php
@@ -17,7 +17,6 @@ use EGroupware\Api;
 
 // explicitly reference classes still in phpgwapi
 use egw_link;
-use historylog;
 use html;
 
 /**
@@ -139,12 +138,11 @@ abstract class Tracking
 	var $errors = array();
 
 	/**
-	 * instance of the historylog object for the app we are tracking
+	 * Instance of the History object for the app we are tracking
 	 *
-	 * @access private
-	 * @var historylog
+	 * @var History
 	 */
-	var $historylog;
+	protected $historylog;
 
 	/**
 	 * Current user, can be set via bo_tracking::track(,,$user)
@@ -403,7 +401,7 @@ abstract class Tracking
 
 		if (!is_object($this->historylog) || $this->historylog->user != $this->user)
 		{
-			$this->historylog = new historylog($this->app,$this->user);
+			$this->historylog = new History($this->app, $this->user);
 		}
 		// log user-agent and session-action
 		if ($GLOBALS['egw_info']['server']['log_user_agent_action'] && ($changed_fields || !$old))