diff --git a/src/env.h b/src/env.h
index 5af2eaa6669f0b..17aa6c7222d19a 100644
--- a/src/env.h
+++ b/src/env.h
@@ -48,8 +48,11 @@
 #include <atomic>
 #include <cstdint>
 #include <functional>
-#include <iostream>
 #include <list>
+#include <memory>
+#include <ostream>
+#include <set>
+#include <string>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
diff --git a/src/util.h b/src/util.h
index 43dac02110adbf..06c67d273ba96b 100644
--- a/src/util.h
+++ b/src/util.h
@@ -32,13 +32,14 @@
 #include <cstdlib>
 #include <cstring>
 
-#include <functional>  // std::function
+#include <array>
 #include <limits>
-#include <set>
+#include <memory>
 #include <string>
-#include <array>
+#include <type_traits>
 #include <unordered_map>
 #include <utility>
+#include <vector>
 
 #ifdef __GNUC__
 #define MUST_USE_RESULT __attribute__((warn_unused_result))