diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index bb884e1303634aca951a9821c8571b070ee908ac..c1926f1d6062cfd7491b08a0222bc500254e9665 100644
--- a/include/class_CopyPasteHandler.inc
+++ b/include/class_CopyPasteHandler.inc
@@ -55,7 +55,7 @@ class CopyPasteHandler
    *
    * \param string $config
    */
-  function CopyPasteHandler(&$config)
+  function __construct(&$config)
   {
     $this->config   = &$config;
     $this->current  = NULL;
diff --git a/include/class_filter.inc b/include/class_filter.inc
index 5b30c14aa7f71f909215e6646acb1965e06142c1..f09247ea3f64c626f7622780ead924c0b3e82de1 100644
--- a/include/class_filter.inc
+++ b/include/class_filter.inc
@@ -51,7 +51,7 @@ class filter
    *
    * \param string $filename
    */
-  function filter($filename)
+  function __construct($filename)
   {
     // Load eventually passed filename
     if (!$this->load($filename)) {
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 81660cd0d336abbcd5b8633a523f8894070b53c7..39f22b56dd1a090591f1c09a8fbcebef63d0af14 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -68,7 +68,7 @@ class LDAP
    *
    * \param boolean $tls FALSE
    */
-  function LDAP($binddn, $bindpw, $hostname, $follow_referral = FALSE, $tls = FALSE)
+  function __construct($binddn, $bindpw, $hostname, $follow_referral = FALSE, $tls = FALSE)
   {
     global $config;
     $this->follow_referral  = $follow_referral;
diff --git a/include/class_listing.inc b/include/class_listing.inc
index b93b6673ae9aa4edc4843f549049d3fc1508270a..788ca2a75b6d26dab93a79592c0c344fa263c5a5 100644
--- a/include/class_listing.inc
+++ b/include/class_listing.inc
@@ -70,7 +70,7 @@ class listing {
    *
    * \param string $data either a filename or an array representation of the XML
    */
-  function listing($data)
+  function __construct($data)
   {
     global $config;
     global $class_mapping;
diff --git a/include/class_log.inc b/include/class_log.inc
index 6ec634e39f7aed14385e607243419e69b3b497c4..2bd5af57c22af10fc88f715467cbad42d8b6b805 100644
--- a/include/class_log.inc
+++ b/include/class_log.inc
@@ -52,7 +52,7 @@ class log {
    *
    * \sa log()
    */
-  function log($action, $objecttype, $object, $changes_array = array(), $result = "")
+  function __construct($action, $objecttype, $object, $changes_array = array(), $result = "")
   {
     if (!is_array($changes_array)) {
       trigger_error("log(string,string,string,array(),bool). Forth parameter must be an array.");