--- a/libupnpp/control/ohinfo.hxx
+++ b/libupnpp/control/ohinfo.hxx
@@ -19,7 +19,7 @@
 
 #include <libupnpp/config.h>
 
-#include UNORDERED_MAP_INCLUDE
+#include <unordered_map>
 #include <string>                       // for string
 #include <vector>                       // for vector
 
@@ -37,7 +37,7 @@
 
 namespace UPnPClient {
 
-typedef STD_SHARED_PTR<OHInfo> OHIFH;
+typedef std::shared_ptr<OHInfo> OHIFH;
 
 /**
  * OHInfo Service client class.
@@ -66,7 +66,7 @@
     static const std::string SType;
 
 private:
-    void evtCallback(const STD_UNORDERED_MAP<std::string, std::string>&);
+    void evtCallback(const std::unordered_map<std::string, std::string>&);
     void registerCallback();
 };