diff -ru mediatomb-0.12.1~org/src/hash/dbo_hash.h mediatomb-0.12.1/src/hash/dbo_hash.h
--- mediatomb-0.12.1~org/src/hash/dbo_hash.h	2010-03-25 23:58:07.000000000 +0900
+++ mediatomb-0.12.1/src/hash/dbo_hash.h	2016-08-22 09:02:58.761739682 +0900
@@ -106,7 +106,7 @@
     inline bool remove(KT key)
     {
         struct dbo_hash_slot<KT, VT> *slot;
-        if (! search(key, &slot))
+        if (! this->search(key, &slot))
             return false;
         slot->key = deletedKey;
         slot->value->release();
@@ -136,7 +136,7 @@
     inline void put(KT key, zmm::Ref<VT> value)
     {
         struct dbo_hash_slot<KT, VT> *slot;
-        search(key, &slot);
+        this->search(key, &slot);
         put(key, (hash_slot_t)slot, value);
     }
     void put(KT key, hash_slot_t destSlot, zmm::Ref<VT> value)
@@ -162,7 +162,7 @@
     inline zmm::Ref<VT> get(KT key)
     {
         struct dbo_hash_slot<KT, VT> *slot;
-        bool found = search(key, &slot);
+        bool found = this->search(key, &slot);
         if (found)
             return zmm::Ref<VT>(slot->value);
         else
@@ -174,7 +174,7 @@
     inline zmm::Ref<VT> get(KT key, hash_slot_t *destSlot)
     {
         struct dbo_hash_slot<KT, VT> **slot = (struct dbo_hash_slot<KT, VT> **)destSlot;
-        bool found = search(key, slot);
+        bool found = this->search(key, slot);
         if (found)
             return zmm::Ref<VT>((*slot)->value);
         else
diff -ru mediatomb-0.12.1~org/src/hash/dbr_hash.h mediatomb-0.12.1/src/hash/dbr_hash.h
--- mediatomb-0.12.1~org/src/hash/dbr_hash.h	2010-03-25 23:58:07.000000000 +0900
+++ mediatomb-0.12.1/src/hash/dbr_hash.h	2016-08-22 09:05:22.529746536 +0900
@@ -124,7 +124,7 @@
     inline bool remove(KT key)
     {
         struct dbr_hash_slot<KT> *slot;
-        if (! search(key, &slot))
+        if (! this->search(key, &slot))
             return false;
         slot->key = deletedKey;
         int array_slot = slot->array_slot;
@@ -134,7 +134,7 @@
             return true;
         }
         data_array[array_slot] = data_array[--this->count];
-        if (! search(data_array[array_slot], &slot))
+        if (! this->search(data_array[array_slot], &slot))
         {
             log_debug("DBR-Hash-Error: (%d; array_slot=%d; count=%d)\n", data_array[array_slot], array_slot, this->count);
             throw zmm::Exception(_("DBR-Hash-Error: key in data_array not found in hashtable"));
@@ -146,7 +146,7 @@
     inline void put(KT key)
     {
         struct dbr_hash_slot<KT> *slot;
-        if (! search(key, &slot))
+        if (! this->search(key, &slot))
         {
 #ifdef TOMBDEBUG
             if (this->count >= realCapacity)
@@ -194,7 +194,7 @@
     inline bool exists(KT key)
     {
         struct dbr_hash_slot<KT> *slot;
-        return search(key, &slot);
+        return this->search(key, &slot);
     }
     
     /*
@@ -202,7 +202,7 @@
      
     inline bool exists(KT key, hash_slot_t *destSlot)
     {
-        return search(key, (KT **)destSlot);
+        return this->search(key, (KT **)destSlot);
     }
     */
 };
diff -ru mediatomb-0.12.1~org/src/hash/dso_hash.h mediatomb-0.12.1/src/hash/dso_hash.h
--- mediatomb-0.12.1~org/src/hash/dso_hash.h	2010-03-25 23:58:07.000000000 +0900
+++ mediatomb-0.12.1/src/hash/dso_hash.h	2016-08-22 09:07:09.041751614 +0900
@@ -100,7 +100,7 @@
     inline bool remove(zmm::String key)
     {
         struct dso_hash_slot<VT> *slot;
-        if (! search(key, &slot))
+        if (! this->search(key, &slot))
             return false;
         slot->key->release();
         slot->value->release();
@@ -112,7 +112,7 @@
     inline void put(zmm::String key, zmm::Ref<VT> value)
     {
         struct dso_hash_slot<VT> *slot;
-        search(key, &slot);
+        this->search(key, &slot);
         put(key, (hash_slot_t)slot, value);
     }
     void put(zmm::String key, hash_slot_t destSlot, zmm::Ref<VT> value)
@@ -141,7 +141,7 @@
     inline zmm::Ref<VT> get(zmm::String key)
     {
         struct dso_hash_slot<VT> *slot;
-        bool found = search(key, &slot);
+        bool found = this->search(key, &slot);
         if (found)
             return zmm::Ref<VT>(slot->value);
         else
@@ -153,7 +153,7 @@
     inline zmm::Ref<VT> get(zmm::String key, hash_slot_t *destSlot)
     {
         struct dso_hash_slot<VT> **slot = (struct dso_hash_slot<VT> **)destSlot;
-        bool found = search(key, slot);
+        bool found = this->search(key, slot);
         if (found)
             return zmm::Ref<VT>((*slot)->value);
         else
diff -ru mediatomb-0.12.1~org/src/zmm/object.h mediatomb-0.12.1/src/zmm/object.h
--- mediatomb-0.12.1~org/src/zmm/object.h	2010-03-25 23:58:08.000000000 +0900
+++ mediatomb-0.12.1/src/zmm/object.h	2016-08-22 09:00:41.217733124 +0900
@@ -33,6 +33,7 @@
 #define __ZMM_OBJECT_H__
 
 #include <new> // for size_t
+#include <cstddef>
 #include "atomic.h"
 
 namespace zmm