diff --git a/util/xxhash.cc b/util/xxhash.cc
index 6dfd4b283..3204cbb0f 100644
--- a/util/xxhash.cc
+++ b/util/xxhash.cc
@@ -92,6 +92,7 @@ FORCE_INLINE void  XXH_free  (void* p)  { free(p); }
 FORCE_INLINE void* XXH_memcpy(void* dest, const void* src, size_t size) { return memcpy(dest,src,size); }
 
 
+namespace rocksdb {
 //**************************************
 // Basic Types
 //**************************************
@@ -473,3 +474,5 @@ U32 XXH32_digest (void* state_in)
 
     return h32;
 }
+
+}  // namespace rocksdb
diff --git a/util/xxhash.h b/util/xxhash.h
index ceff06677..3343e3488 100644
--- a/util/xxhash.h
+++ b/util/xxhash.h
@@ -60,7 +60,7 @@ It depends on successfully passing SMHasher test set.
 #pragma once
 
 #if defined (__cplusplus)
-extern "C" {
+namespace rocksdb {
 #endif
 
 
@@ -160,5 +160,5 @@ To free memory context, use XXH32_digest(), or free().
 
 
 #if defined (__cplusplus)
-}
+}  // namespace rocksdb
 #endif