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