diff --git a/3party/protobuf/config.h b/3party/protobuf/config.h
index 64dda2550b..5b53c0098e 100644
--- a/3party/protobuf/config.h
+++ b/3party/protobuf/config.h
@@ -1,20 +1,32 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* the name of <hash_set> */
+/* the name of <hash_map> */
 #define HASH_MAP_CLASS unordered_map
 
 /* the location of <hash_map> */
-#define HASH_MAP_H <tr1/unordered_map>
+#ifdef _MSC_VER
+  #define HASH_MAP_H <hash_map>
+#else
+  #define HASH_MAP_H <tr1/unordered_map>
+#endif
 
 /* the namespace of hash_map/hash_set */
-#define HASH_NAMESPACE std::tr1
+#ifdef _MSC_VER
+  #define HASH_NAMESPACE stdext
+#else
+  #define HASH_NAMESPACE std::tr1
+#endif
 
 /* the name of <hash_set> */
 #define HASH_SET_CLASS unordered_set
 
 /* the location of <hash_set> */
-#define HASH_SET_H <tr1/unordered_set>
+#ifdef _MSC_VER
+  #define HASH_SET_H <hash_set>
+#else
+  #define HASH_SET_H <tr1/unordered_set>
+#endif
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
diff --git a/3party/protobuf/src/google/protobuf/stubs/common.cc b/3party/protobuf/src/google/protobuf/stubs/common.cc
index 7b15be44d8..e7272bc82f 100644
--- a/3party/protobuf/src/google/protobuf/stubs/common.cc
+++ b/3party/protobuf/src/google/protobuf/stubs/common.cc
@@ -36,7 +36,7 @@
 #include <errno.h>
 #include <vector>
 
-#include "config.h"
+#include "../../../../config.h"
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN  // We only need minimal includes
diff --git a/3party/protobuf/src/google/protobuf/stubs/hash.h b/3party/protobuf/src/google/protobuf/stubs/hash.h
index 822d605013..74b040a7b2 100644
--- a/3party/protobuf/src/google/protobuf/stubs/hash.h
+++ b/3party/protobuf/src/google/protobuf/stubs/hash.h
@@ -37,7 +37,7 @@
 
 #include <string.h>
 #include <google/protobuf/stubs/common.h>
-#include "config.h"
+#include "../../../../config.h"
 
 #if defined(HAVE_HASH_MAP) && defined(HAVE_HASH_SET)
 #include HASH_MAP_H