diff --git a/Core/Code/CppMicroServices/usConfig.h.in b/Core/Code/CppMicroServices/usConfig.h.in
index 6d12006f80..bb51f969e7 100644
--- a/Core/Code/CppMicroServices/usConfig.h.in
+++ b/Core/Code/CppMicroServices/usConfig.h.in
@@ -1,157 +1,162 @@
 /*
   USCONFIG.h
   this file is generated. Do not change!
 */
 
 #ifndef USCONFIG_H
 #define USCONFIG_H
 
 #cmakedefine US_BUILD_SHARED_LIBS
 #cmakedefine CppMicroServices_EXPORTS
 #cmakedefine US_ENABLE_THREADING_SUPPORT
 #cmakedefine US_ENABLE_SERVICE_FACTORY_SUPPORT
 #cmakedefine US_USE_CXX11
 
 //-------------------------------------------------------------------
 // Namespace customization
 //-------------------------------------------------------------------
 
 #define US_NAMESPACE @US_NAMESPACE@
 
 #ifndef US_NAMESPACE /* user namespace */
 
   # define US_PREPEND_NAMESPACE(name) ::name
   # define US_USE_NAMESPACE
   # define US_BEGIN_NAMESPACE
   # define US_END_NAMESPACE
   # define US_FORWARD_DECLARE_CLASS(name) class name;
   # define US_FORWARD_DECLARE_STRUCT(name) struct name;
 
 #else /* user namespace */
 
   # define US_PREPEND_NAMESPACE(name) ::US_NAMESPACE::name
   # define US_USE_NAMESPACE using namespace ::US_NAMESPACE;
   # define US_BEGIN_NAMESPACE namespace US_NAMESPACE {
   # define US_END_NAMESPACE }
   # define US_FORWARD_DECLARE_CLASS(name) \
     US_BEGIN_NAMESPACE class name; US_END_NAMESPACE
 
   # define US_FORWARD_DECLARE_STRUCT(name) \
     US_BEGIN_NAMESPACE struct name; US_END_NAMESPACE
 
   namespace US_NAMESPACE {}
 
 #endif /* user namespace */
 
 #define US_BASECLASS_NAME @US_BASECLASS_NAME@
 #define US_BASECLASS_HEADER <@US_BASECLASS_HEADER@>
 
 // base class forward declaration
 @US_BASECLASS_FORWARD_DECLARATION@
 
 //-------------------------------------------------------------------
 // Platform defines
 //-------------------------------------------------------------------
 
 #if defined(__APPLE__)
   #define US_PLATFORM_APPLE
 #endif
 
 #if defined(_WIN32) || defined(_WIN64)
   #define US_PLATFORM_WINDOWS
 #else
   #define US_PLATFORM_POSIX
 #endif
 
 //-------------------------------------------------------------------
 // Compiler defines
 //-------------------------------------------------------------------
 
 #if defined(_MSC_VER) && !defined(_SCL_SECURE_NO_WARNINGS)
   #define _SCL_SECURE_NO_WARNINGS
 #endif
 
 //-------------------------------------------------------------------
 // Hash Container
 //-------------------------------------------------------------------
 
 #ifdef US_USE_CXX11
 
   #include <unordered_map>
   #include <unordered_set>
 
   #define US_HASH_FUNCTION_BEGIN(type) \
   template<> \
   struct hash<type> : std::unary_function<type, std::size_t> { \
   std::size_t operator()(const type& arg) const {
 
   #define US_HASH_FUNCTION_END } };
 
   #define US_HASH_FUNCTION(type, arg) hash<type>()(arg)
-  #define US_HASH_FUNCTION_FRIEND(type) friend struct ::std::hash<type>
+  
+  #ifdef US_PLATFORM_WINDOWS
+    #define US_HASH_FUNCTION_FRIEND(type) friend class ::std::hash<type>
+  #else
+    #define US_HASH_FUNCTION_FRIEND(type) friend struct ::std::hash<type>
+  #endif
 
   #define US_UNORDERED_MAP_TYPE ::std::unordered_map
   #define US_UNORDERED_SET_TYPE ::std::unordered_set
 
   #define US_HASH_FUNCTION_NAMESPACE ::std
   #define US_HASH_FUNCTION_NAMESPACE_BEGIN namespace std {
   #define US_HASH_FUNCTION_NAMESPACE_END }
 
 #elif defined(__GNUC__)
 
   #include <tr1/unordered_map>
   #include <tr1/unordered_set>
   
   #define US_HASH_FUNCTION_BEGIN(type) \
   template<> \
   struct hash<type> : std::unary_function<type, std::size_t> { \
   std::size_t operator()(const type& arg) const { 
   
   #define US_HASH_FUNCTION_END } };
   
   #define US_HASH_FUNCTION(type, arg) hash<type>()(arg)
   #define US_HASH_FUNCTION_FRIEND(type) friend struct ::std::tr1::hash<type>
 
   #define US_UNORDERED_MAP_TYPE ::std::tr1::unordered_map
   #define US_UNORDERED_SET_TYPE ::std::tr1::unordered_set
 
   #define US_HASH_FUNCTION_NAMESPACE ::std::tr1
   #define US_HASH_FUNCTION_NAMESPACE_BEGIN namespace std { namespace tr1 {
   #define US_HASH_FUNCTION_NAMESPACE_END }}
 
 #elif _MSC_VER <= 1500 // Visual Studio 2008 and lower
 
   #include <hash_map>
   #include <hash_set>
   
   #define US_HASH_FUNCTION_BEGIN(type) \
   template<> \
   inline std::size_t hash_value<type>(const type& arg) { 
   
   #define US_HASH_FUNCTION_END }
   
   #define US_HASH_FUNCTION(type, arg) hash_value(arg)
   #define US_HASH_FUNCTION_FRIEND(type) friend std::size_t stdext::hash_value<type>(const type&)
 
   #define US_UNORDERED_MAP_TYPE ::stdext::hash_map
   #define US_UNORDERED_SET_TYPE ::stdext::hash_set
 
   #define US_HASH_FUNCTION_NAMESPACE ::stdext
   #define US_HASH_FUNCTION_NAMESPACE_BEGIN namespace stdext {
   #define US_HASH_FUNCTION_NAMESPACE_END }
 
 #endif
 
 
 //-------------------------------------------------------------------
 // Threading Configuration
 //-------------------------------------------------------------------
 
 #ifdef US_ENABLE_THREADING_SUPPORT
   #define US_DEFAULT_THREADING US_PREPEND_NAMESPACE(MultiThreaded)
 #else
   #define US_DEFAULT_THREADING US_PREPEND_NAMESPACE(SingleThreaded)
 #endif
 
 
 #endif // USCONFIG_H