3 files changed, 12 insertions, 12 deletions
diff --git a/include/framework/DynamicExtension.h b/include/framework/DynamicExtension.h
index 5c903b9..524024b 100644
--- a/include/framework/DynamicExtension.h
+++ b/include/framework/DynamicExtension.h
@@ -21,8 +21,8 @@
 #include "framework/RecordInterface.h"
 
 #include "shard/WIRS.h"
-#include "ds/Alias.h"
-#include "util/timer.h"
+#include "psu-util/timer.h"
+#include "psu-ds/Alias.h"
 
 namespace de {
 
diff --git a/include/framework/MutableBuffer.h b/include/framework/MutableBuffer.h
index 9eea5c8..b79fc02 100644
--- a/include/framework/MutableBuffer.h
+++ b/include/framework/MutableBuffer.h
@@ -16,15 +16,16 @@
 #include <algorithm>
 #include <type_traits>
 
-#include "util/base.h"
+#include "psu-util/alignment.h"
 #include "util/bf_config.h"
-#include "ds/BloomFilter.h"
-#include "ds/Alias.h"
-#include "util/timer.h"
+#include "psu-ds/BloomFilter.h"
+#include "psu-ds/Alias.h"
+#include "psu-util/timer.h"
 #include "framework/RecordInterface.h"
 
-namespace de {
+using psudb::CACHELINE_SIZE;
 
+namespace de {
 
 template <RecordInterface R>
 class MutableBuffer {
@@ -37,7 +38,7 @@ public:
         m_data = (Wrapped<R>*) std::aligned_alloc(CACHELINE_SIZE, aligned_buffersize);
         m_tombstone_filter = nullptr;
         if (max_tombstone_cap > 0) {
-            m_tombstone_filter = new BloomFilter<R>(BF_FPR, max_tombstone_cap, BF_HASH_FUNCS);
+            m_tombstone_filter = new psudb::BloomFilter<R>(BF_FPR, max_tombstone_cap, BF_HASH_FUNCS);
         }
     }
 
@@ -168,7 +169,7 @@ private:
     size_t m_tombstone_cap;
     
     Wrapped<R>* m_data;
-    BloomFilter<R>* m_tombstone_filter;
+    psudb::BloomFilter<R>* m_tombstone_filter;
 
     alignas(64) std::atomic<size_t> m_tombstonecnt;
     alignas(64) std::atomic<uint32_t> m_reccnt;
diff --git a/include/framework/RecordInterface.h b/include/framework/RecordInterface.h
index f0d9f5c..f78918c 100644
--- a/include/framework/RecordInterface.h
+++ b/include/framework/RecordInterface.h
@@ -13,8 +13,7 @@
 #include <concepts>
 #include <cmath>
 
-#include "util/base.h"
-#include "util/hash.h"
+#include "psu-util/hash.h"
 
 namespace de {
 
@@ -208,7 +207,7 @@ struct EuclidPoint{
 template<RecordInterface R>
 struct RecordHash {
     size_t operator()(R const &rec) const {
-        return hash_bytes((char *) &rec, sizeof(R));
+        return psudb::hash_bytes((char *) &rec, sizeof(R));
     }
 };