diff --git a/Internal.h b/Internal.h
index ee2373e..8f093c2 100644
--- a/Internal.h
+++ b/Internal.h
@@ -2,12 +2,12 @@
 
 #include <new>
 
-#include <algorithm>
 #include <assert.h>
 #include <bit>
 #include <span>
 #include <stdlib.h>
 #include <string.h>
+#include <utility>
 
 #ifndef SHOW_MEMORY
 #define SHOW_MEMORY 0
diff --git a/VersionedMap.cpp b/VersionedMap.cpp
index bba8dc6..9442b02 100644
--- a/VersionedMap.cpp
+++ b/VersionedMap.cpp
@@ -5,13 +5,13 @@
 #include <assert.h>
 #include <atomic>
 #include <inttypes.h>
+#include <optional>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <unordered_set>
 #include <xxhash.h>
 
 static_assert(std::is_standard_layout_v<weaselab::VersionedMap::MutationType>);
diff --git a/aarch64-symbol-imports.txt b/aarch64-symbol-imports.txt
index 99ab86c..5f7e36c 100644
--- a/aarch64-symbol-imports.txt
+++ b/aarch64-symbol-imports.txt
@@ -1,8 +1,17 @@
-__stack_chk_fail@GLIBC_2.17
-__stack_chk_guard@GLIBC_2.17
+__errno_location@GLIBC_2.17
 abort@GLIBC_2.17
+calloc@GLIBC_2.17
+fflush@GLIBC_2.17
+fprintf@GLIBC_2.17
 free@GLIBC_2.17
+fwrite@GLIBC_2.17
 malloc@GLIBC_2.17
+memcmp@GLIBC_2.17
 memcpy@GLIBC_2.17
-memmove@GLIBC_2.17
-memset@GLIBC_2.17
\ No newline at end of file
+memset@GLIBC_2.17
+mmap@GLIBC_2.17
+mprotect@GLIBC_2.17
+munmap@GLIBC_2.17
+stderr@GLIBC_2.17
+strerror@GLIBC_2.17
+sysconf@GLIBC_2.17
\ No newline at end of file
diff --git a/linker.map b/linker.map
index 3691443..ca73009 100644
--- a/linker.map
+++ b/linker.map
@@ -1,6 +1,6 @@
 {
   global:
-    *ConflictSet*;
+    *VersionedMap*;
   local:
     *;
 };
\ No newline at end of file
diff --git a/symbol-exports.txt b/symbol-exports.txt
index 42c0562..7c6426a 100644
--- a/symbol-exports.txt
+++ b/symbol-exports.txt
@@ -1,17 +1,31 @@
-ConflictSet_addWrites
-ConflictSet_check
-ConflictSet_create
-ConflictSet_destroy
-ConflictSet_getBytes
-ConflictSet_setOldestVersion
-_ZN8weaselab11ConflictSet16setOldestVersionEl
-_ZN8weaselab11ConflictSet9addWritesEPKNS0_10WriteRangeEil
-_ZN8weaselab11ConflictSetaSEOS0_
-_ZN8weaselab11ConflictSetC1El
-_ZN8weaselab11ConflictSetC1EOS0_
-_ZN8weaselab11ConflictSetC2El
-_ZN8weaselab11ConflictSetC2EOS0_
-_ZN8weaselab11ConflictSetD1Ev
-_ZN8weaselab11ConflictSetD2Ev
-_ZNK8weaselab11ConflictSet5checkEPKNS0_9ReadRangeEPNS0_6ResultEi
-_ZNK8weaselab11ConflictSet8getBytesEv
+_ZN8weaselab12VersionedMap12addMutationsEPKNS0_8MutationEil
+_ZN8weaselab12VersionedMap16setOldestVersionEl
+_ZN8weaselab12VersionedMap8IteratorC1EOS1_
+_ZN8weaselab12VersionedMap8IteratorC1ERKS1_
+_ZN8weaselab12VersionedMap8IteratorC2EOS1_
+_ZN8weaselab12VersionedMap8IteratorC2ERKS1_
+_ZN8weaselab12VersionedMap8IteratorD1Ev
+_ZN8weaselab12VersionedMap8IteratorD2Ev
+_ZN8weaselab12VersionedMap8IteratoraSEOS1_
+_ZN8weaselab12VersionedMap8IteratoraSERKS1_
+_ZN8weaselab12VersionedMap8IteratormmEi
+_ZN8weaselab12VersionedMap8IteratormmEv
+_ZN8weaselab12VersionedMap8IteratorppEi
+_ZN8weaselab12VersionedMap8IteratorppEv
+_ZN8weaselab12VersionedMapC1EOS0_
+_ZN8weaselab12VersionedMapC1El
+_ZN8weaselab12VersionedMapC2EOS0_
+_ZN8weaselab12VersionedMapC2El
+_ZN8weaselab12VersionedMapD1Ev
+_ZN8weaselab12VersionedMapD2Ev
+_ZN8weaselab12VersionedMapaSEOS0_
+_ZNK8weaselab12VersionedMap10getVersionEv
+_ZNK8weaselab12VersionedMap16getOldestVersionEv
+_ZNK8weaselab12VersionedMap3endEl
+_ZNK8weaselab12VersionedMap5beginEl
+_ZNK8weaselab12VersionedMap8Iterator3cmpEv
+_ZNK8weaselab12VersionedMap8IteratordeEv
+_ZNK8weaselab12VersionedMap8IteratoreqERKS1_
+_ZNK8weaselab12VersionedMap8IteratorneERKS1_
+_ZNK8weaselab12VersionedMap8firstGeqEPKNS0_3KeyEPKlPNS0_8IteratorEi
+_ZNK8weaselab12VersionedMap8getBytesEv
\ No newline at end of file