diff --git a/include/flatbuffers/buffer.h b/include/flatbuffers/buffer.h
index 96ae538f3a2..e26a153c3fb 100644
--- a/include/flatbuffers/buffer.h
+++ b/include/flatbuffers/buffer.h
@@ -17,6 +17,8 @@
 #ifndef FLATBUFFERS_BUFFER_H_
 #define FLATBUFFERS_BUFFER_H_
 
+#include <algorithm>
+
 #include "flatbuffers/base.h"
 
 namespace flatbuffers {
@@ -149,4 +151,4 @@ template<typename T> const T *GetSizePrefixedRoot(const void *buf) {
 
 }  // namespace flatbuffers
 
-#endif  // FLATBUFFERS_BUFFER_H_
\ No newline at end of file
+#endif  // FLATBUFFERS_BUFFER_H_
diff --git a/include/flatbuffers/flatbuffer_builder.h b/include/flatbuffers/flatbuffer_builder.h
index 66c33ffccdf..090a60e4f1b 100644
--- a/include/flatbuffers/flatbuffer_builder.h
+++ b/include/flatbuffers/flatbuffer_builder.h
@@ -17,6 +17,7 @@
 #ifndef FLATBUFFERS_FLATBUFFER_BUILDER_H_
 #define FLATBUFFERS_FLATBUFFER_BUILDER_H_
 
+#include <algorithm>
 #include <functional>
 #include <initializer_list>
 
diff --git a/include/flatbuffers/flatbuffers.h b/include/flatbuffers/flatbuffers.h
index 642178897b2..d7ee6ab4ddd 100644
--- a/include/flatbuffers/flatbuffers.h
+++ b/include/flatbuffers/flatbuffers.h
@@ -17,6 +17,8 @@
 #ifndef FLATBUFFERS_H_
 #define FLATBUFFERS_H_
 
+#include <algorithm>
+
 // TODO: These includes are for mitigating the pains of users editing their
 // source because they relied on flatbuffers.h to include everything for them.
 #include "flatbuffers/array.h"
diff --git a/include/flatbuffers/flexbuffers.h b/include/flatbuffers/flexbuffers.h
index 7bf84302e5f..79cdd9c5d62 100644
--- a/include/flatbuffers/flexbuffers.h
+++ b/include/flatbuffers/flexbuffers.h
@@ -17,6 +17,7 @@
 #ifndef FLATBUFFERS_FLEXBUFFERS_H_
 #define FLATBUFFERS_FLEXBUFFERS_H_
 
+#include <algorithm>
 #include <map>
 // Used to select STL variant.
 #include "flatbuffers/base.h"
diff --git a/include/flatbuffers/idl.h b/include/flatbuffers/idl.h
index fd2da8bfae8..2cd67cd965f 100644
--- a/include/flatbuffers/idl.h
+++ b/include/flatbuffers/idl.h
@@ -17,6 +17,7 @@
 #ifndef FLATBUFFERS_IDL_H_
 #define FLATBUFFERS_IDL_H_
 
+#include <algorithm>
 #include <functional>
 #include <map>
 #include <memory>
diff --git a/include/flatbuffers/util.h b/include/flatbuffers/util.h
index 73a3ab786b2..f8d9f99a5a2 100644
--- a/include/flatbuffers/util.h
+++ b/include/flatbuffers/util.h
@@ -31,6 +31,7 @@
 #  include <stdio.h>
 #endif  // FLATBUFFERS_PREFER_PRINTF
 
+#include <limits>
 #include <string>
 
 namespace flatbuffers {
diff --git a/include/flatbuffers/vector_downward.h b/include/flatbuffers/vector_downward.h
index d25e544970c..2dbaa60055a 100644
--- a/include/flatbuffers/vector_downward.h
+++ b/include/flatbuffers/vector_downward.h
@@ -17,6 +17,8 @@
 #ifndef FLATBUFFERS_VECTOR_DOWNWARD_H_
 #define FLATBUFFERS_VECTOR_DOWNWARD_H_
 
+#include <algorithm>
+
 #include "flatbuffers/base.h"
 #include "flatbuffers/default_allocator.h"
 #include "flatbuffers/detached_buffer.h"
diff --git a/src/annotated_binary_text_gen.cpp b/src/annotated_binary_text_gen.cpp
index ec30b1dd696..1c7a4dd623a 100644
--- a/src/annotated_binary_text_gen.cpp
+++ b/src/annotated_binary_text_gen.cpp
@@ -1,5 +1,6 @@
 #include "annotated_binary_text_gen.h"
 
+#include <algorithm>
 #include <sstream>
 #include <string>
 
diff --git a/src/binary_annotator.cpp b/src/binary_annotator.cpp
index dd0b4549e68..274c629bc32 100644
--- a/src/binary_annotator.cpp
+++ b/src/binary_annotator.cpp
@@ -1,5 +1,6 @@
 #include "binary_annotator.h"
 
+#include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ -1416,4 +1417,4 @@ bool BinaryAnnotator::ContainsSection(const uint64_t offset) {
                                              it->second.regions.back().length;
 }
 
-}  // namespace flatbuffers
\ No newline at end of file
+}  // namespace flatbuffers
diff --git a/src/flatc.cpp b/src/flatc.cpp
index 1d12a1769c7..8f6ef0041dc 100644
--- a/src/flatc.cpp
+++ b/src/flatc.cpp
@@ -16,6 +16,8 @@
 
 #include "flatbuffers/flatc.h"
 
+#include <algorithm>
+#include <limits>
 #include <list>
 #include <sstream>
 
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index dfe55e022bf..6072c0889d1 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -16,6 +16,7 @@
 
 // independent from idl_parser, since this code is not needed for most clients
 
+#include <limits>
 #include <string>
 #include <unordered_set>
 
diff --git a/src/idl_gen_go.cpp b/src/idl_gen_go.cpp
index 51e018a0093..76a6066e209 100644
--- a/src/idl_gen_go.cpp
+++ b/src/idl_gen_go.cpp
@@ -16,6 +16,7 @@
 
 // independent from idl_parser, since this code is not needed for most clients
 
+#include <algorithm>
 #include <sstream>
 #include <string>
 
diff --git a/src/idl_gen_json_schema.cpp b/src/idl_gen_json_schema.cpp
index 5cb6a9dcb22..796d1e20ca6 100644
--- a/src/idl_gen_json_schema.cpp
+++ b/src/idl_gen_json_schema.cpp
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
+#include <algorithm>
 #include <iostream>
+#include <limits>
 
 #include "flatbuffers/code_generators.h"
 #include "flatbuffers/idl.h"
diff --git a/src/idl_gen_text.cpp b/src/idl_gen_text.cpp
index 3b69c9587e8..52f854dd458 100644
--- a/src/idl_gen_text.cpp
+++ b/src/idl_gen_text.cpp
@@ -16,6 +16,8 @@
 
 // independent from idl_parser, since this code is not needed for most clients
 
+#include <algorithm>
+
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/flexbuffers.h"
 #include "flatbuffers/idl.h"
diff --git a/tests/flexbuffers_test.cpp b/tests/flexbuffers_test.cpp
index 1b34f85820e..b8da8ed70d3 100644
--- a/tests/flexbuffers_test.cpp
+++ b/tests/flexbuffers_test.cpp
@@ -1,3 +1,5 @@
+#include <limits>
+
 #include "flexbuffers_test.h"
 
 #include "flatbuffers/flexbuffers.h"
@@ -289,4 +291,4 @@ void ParseFlexbuffersFromJsonWithNullTest() {
 }
 
 }  // namespace tests
-}  // namespace flatbuffers
\ No newline at end of file
+}  // namespace flatbuffers
diff --git a/tests/fuzz_test.cpp b/tests/fuzz_test.cpp
index 66883faaa1f..060742466cd 100644
--- a/tests/fuzz_test.cpp
+++ b/tests/fuzz_test.cpp
@@ -1,3 +1,5 @@
+#include <algorithm>
+
 #include "fuzz_test.h"
 
 #include "flatbuffers/flatbuffers.h"
@@ -302,4 +304,4 @@ void FuzzTest2() {
 }
 
 }  // namespace tests
-}  // namespace flatbuffers
\ No newline at end of file
+}  // namespace flatbuffers
diff --git a/tests/monster_test.cpp b/tests/monster_test.cpp
index 6e810dd5bf6..f081dd92f51 100644
--- a/tests/monster_test.cpp
+++ b/tests/monster_test.cpp
@@ -1,5 +1,6 @@
 #include "monster_test.h"
 
+#include <limits>
 #include <vector>
 
 #include "flatbuffers/flatbuffer_builder.h"
@@ -852,4 +853,4 @@ void UnPackTo(const uint8_t *flatbuf) {
 }
 
 }  // namespace tests
-}  // namespace flatbuffers
\ No newline at end of file
+}  // namespace flatbuffers
diff --git a/tests/parser_test.cpp b/tests/parser_test.cpp
index 1a435044576..4d9e0762bc1 100644
--- a/tests/parser_test.cpp
+++ b/tests/parser_test.cpp
@@ -1,6 +1,7 @@
 #include "parser_test.h"
 
 #include <cmath>
+#include <limits>
 #include <string>
 
 #include "flatbuffers/idl.h"
diff --git a/tests/test.cpp b/tests/test.cpp
index 6e5dbc4e3ed..440077acd8c 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -16,6 +16,7 @@
 #include <stdint.h>
 
 #include <cmath>
+#include <limits>
 #include <memory>
 #include <string>