diff --git a/include/dwarfs/cyclic_hash.h b/include/dwarfs/cyclic_hash.h
index ef888ca5..1f213966 100644
--- a/include/dwarfs/cyclic_hash.h
+++ b/include/dwarfs/cyclic_hash.h
@@ -31,8 +31,11 @@ template <typename T>
 class byte_hash {
  public:
   byte_hash() {
-    std::default_random_engine generator;
-    std::uniform_int_distribution<T> distribution(0, static_cast<T>(-1));
+    std::mt19937_64 generator;
+    std::uniform_int_distribution<T> distribution(
+        0, std::numeric_limits<T>::max());
+
+    generator.seed(42);
 
     for (size_t i = 0; i < hash_.size(); ++i) {
       hash_[i] = distribution(generator);
diff --git a/src/dwarfs/block_manager.cpp b/src/dwarfs/block_manager.cpp
index 9276c27f..2d88f98d 100644
--- a/src/dwarfs/block_manager.cpp
+++ b/src/dwarfs/block_manager.cpp
@@ -32,7 +32,6 @@
 #include <sparsehash/dense_hash_map>
 
 #include "dwarfs/block_manager.h"
-#include "dwarfs/cyclic_hash.h"
 #include "dwarfs/entry.h"
 #include "dwarfs/filesystem_writer.h"
 #include "dwarfs/inode.h"