diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5134655..53fbbae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.13)
 project(sqlgen)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 
 find_package(LLVM REQUIRED CONFIG)
 
diff --git a/SQLInsertEmitter.h b/SQLInsertEmitter.h
index 4b613c3..34d3d2a 100644
--- a/SQLInsertEmitter.h
+++ b/SQLInsertEmitter.h
@@ -2,6 +2,7 @@
 #define SQLGEN_SQLINSERTEMITTER_H
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/Optional.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/TableGen/Record.h"