diff --git a/src/Functions/keyvaluepair/impl/NeedleFactory.h b/src/Functions/keyvaluepair/impl/NeedleFactory.h
index b5f0645abcc..83862a2281a 100644
--- a/src/Functions/keyvaluepair/impl/NeedleFactory.h
+++ b/src/Functions/keyvaluepair/impl/NeedleFactory.h
@@ -3,6 +3,7 @@
 #include <Functions/keyvaluepair/impl/Configuration.h>
 #include <base/find_symbols.h>
 
+#include <iterator>
 #include <vector>
 
 namespace DB
diff --git a/src/Functions/keyvaluepair/impl/StateHandler.h b/src/Functions/keyvaluepair/impl/StateHandler.h
index 27c1a0b44be..178974e9d36 100644
--- a/src/Functions/keyvaluepair/impl/StateHandler.h
+++ b/src/Functions/keyvaluepair/impl/StateHandler.h
@@ -2,7 +2,6 @@
 
 #include <string_view>
 
-#include <iostream>
 
 namespace DB
 {
diff --git a/src/Functions/keyvaluepair/tests/gtest_extractKeyValuePairs.cpp b/src/Functions/keyvaluepair/tests/gtest_extractKeyValuePairs.cpp
index 735bdd452d7..76694869b9c 100644
--- a/src/Functions/keyvaluepair/tests/gtest_extractKeyValuePairs.cpp
+++ b/src/Functions/keyvaluepair/tests/gtest_extractKeyValuePairs.cpp
@@ -9,11 +9,11 @@
 #include <Formats/FormatSettings.h>
 #include <IO/WriteBufferFromString.h>
 
-#include <ostream>
 #include <gtest/gtest.h>
 #include <initializer_list>
 #include <Core/iostream_debug_helpers.h>
 
+
 namespace
 {
 using namespace DB;
@@ -33,7 +33,7 @@ auto ToColumnMap(const auto & keys, const auto & values, const ColumnPtr offsets
 std::string PrintMap(const auto & keys, const auto & values)
 {
     auto map_column = ToColumnMap(keys, values);
-    auto serialization = DataTypeFactory::instance().get("Map(String, String)")->getSerialization(ISerialization::Kind::DEFAULT);
+    auto serialization = DataTypeFactory::instance().get("map(string, string)")->getSerialization(ISerialization::Kind::DEFAULT);
 
     WriteBufferFromOwnString buff;
     serialization->serializeTextJSON(*map_column, 0, buff, FormatSettings{});