diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4be62e5..b0f0140 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,7 @@ endif()
 find_package(ZLIB REQUIRED)
 include_directories(${ZLIB_INCLUDE_DIR})
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 
 if(!TM_VERSION)
 	execute_process(
diff --git a/include/attribute_store.h b/include/attribute_store.h
index c18f91f..7d3eafe 100644
--- a/include/attribute_store.h
+++ b/include/attribute_store.h
@@ -5,6 +5,7 @@
 #include "vector_tile.pb.h"
 #include <boost/functional/hash.hpp>
 #include <boost/intrusive_ptr.hpp>
+#include <mutex>
 #include <atomic>
 
 /*	AttributeStore