--- a/libupnpp/control/ohvolume.cxx
+++ b/libupnpp/control/ohvolume.cxx
@@ -31,7 +31,7 @@
 #include "libupnpp/upnpp_p.hxx"         // for stringToBool
 
 using namespace std;
-using namespace std::placeholders;
+using namespace STD_PLACEHOLDERS;
 using namespace UPnPP;
 
 namespace UPnPClient {
@@ -47,10 +47,11 @@
 }
 
 void OHVolume::evtCallback(
-    const std::unordered_map<std::string, std::string>& props)
+    const STD_UNORDERED_MAP<std::string, std::string>& props)
 {
     LOGDEB1("OHVolume::evtCallback: getReporter(): " << getReporter() << endl);
-    for (auto it = props.begin(); it != props.end(); it++) {
+    for (STD_UNORDERED_MAP<std::string, std::string>::const_iterator it = 
+             props.begin(); it != props.end(); it++) {
         if (!getReporter()) {
             LOGDEB1("OHVolume::evtCallback: " << it->first << " -> "
                     << it->second << endl);