diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97a676d..bc5dee7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ add_test(NAME conflict_set_test COMMAND conflict_set_test)
 add_executable(conflict_set_c_api_test conflict_set_c_api_test.c ConflictSet.h)
 target_link_libraries(conflict_set_c_api_test PRIVATE conflict_set)
 target_compile_options(conflict_set_c_api_test PRIVATE -UNDEBUG)
-set_property(TARGET conflict_set_c_api_test PROPERTY C_STANDARD 90)
+set_property(TARGET conflict_set_c_api_test PROPERTY C_STANDARD 99)
 add_test(NAME conflict_set_c_api_test COMMAND conflict_set_c_api_test)
 target_compile_options(conflict_set_c_api_test PRIVATE -Wall -Wextra -Wpedantic -Wunreachable-code -Werror)
 
diff --git a/ConflictSet.cpp b/ConflictSet.cpp
index db7affb..6be8671 100644
--- a/ConflictSet.cpp
+++ b/ConflictSet.cpp
@@ -1,8 +1,9 @@
 #include "ConflictSet.h"
 
+#include <algorithm>
 #include <cassert>
 #include <compare>
-#include <memory>
+#include <cstring>
 #include <random>
 #include <span>
 #include <string_view>
@@ -818,6 +819,10 @@ __attribute__((__visibility__("default"))) void ConflictSet_destroy(void *cs) {
 }
 }
 
+namespace std {
+void __throw_length_error(const char *) { abort(); }
+} // namespace std
+
 #ifdef ENABLE_TESTS
 int main(void) {
   int64_t writeVersion = 0;