diff --git a/cache/mapcache.h b/cache/mapcache.h
index 4f0d00f..e1301d8 100644
--- a/cache/mapcache.h
+++ b/cache/mapcache.h
@@ -3,6 +3,7 @@
 #include <map>
 #include <set>
 #include <shared_mutex>
+#include <optional>
 
 /* Thread-Safe Key-Value store */
 template <class T> class MapCache
diff --git a/database/permissionsdao.h b/database/permissionsdao.h
index 7082abe..2a82cff 100644
--- a/database/permissionsdao.h
+++ b/database/permissionsdao.h
@@ -1,5 +1,6 @@
 #ifndef PERMISSIONSDAO_H
 #define PERMISSIONSDAO_H
+#include <optional>
 #include "../permissions.h"
 #include "../user.h"
 class PermissionsDao
diff --git a/utils.h b/utils.h
index cbe71c8..a83aa60 100644
--- a/utils.h
+++ b/utils.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <regex>
 #include <ctime>
+#include <limits>
 namespace utils
 {