diff --git a/src/Columns/Collator.h b/src/Columns/Collator.h
index df60aaba434..93748f21f7f 100644
--- a/src/Columns/Collator.h
+++ b/src/Columns/Collator.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <optional>
 #include <vector>
 #include <boost/noncopyable.hpp>
 #include <unordered_map>
diff --git a/src/Core/NamesAndTypes.h b/src/Core/NamesAndTypes.h
index fc86c7f6a1d..0c871f08d8b 100644
--- a/src/Core/NamesAndTypes.h
+++ b/src/Core/NamesAndTypes.h
@@ -2,6 +2,7 @@
 
 #include <map>
 #include <list>
+#include <optional>
 #include <string>
 #include <set>
 #include <initializer_list>
diff --git a/src/Storages/MergeTree/MergeTreePartInfo.h b/src/Storages/MergeTree/MergeTreePartInfo.h
index 338fe7549aa..8b77442bf8b 100644
--- a/src/Storages/MergeTree/MergeTreePartInfo.h
+++ b/src/Storages/MergeTree/MergeTreePartInfo.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <limits>
 #include <tuple>
 #include <common/types.h>
 #include <common/DayNum.h>