diff --git a/lib/Fuzzer/FuzzerCrossOver.cpp b/lib/Fuzzer/FuzzerCrossOver.cpp
index 87ad555d314..94af6d547ed 100644
--- a/lib/Fuzzer/FuzzerCrossOver.cpp
+++ b/lib/Fuzzer/FuzzerCrossOver.cpp
@@ -10,6 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "FuzzerInternal.h"
+#include <algorithm>
 
 namespace fuzzer {
 
diff --git a/lib/Fuzzer/test/ExactTest.cpp b/lib/Fuzzer/test/ExactTest.cpp
index 662dd333eea..c9898f3c811 100644
--- a/lib/Fuzzer/test/ExactTest.cpp
+++ b/lib/Fuzzer/test/ExactTest.cpp
@@ -1,4 +1,5 @@
 // Simple test for a fuzzer. The fuzzer must find the string "FUZZER".
+#include <cstdint>
 #include <cstdlib>
 #include <cstddef>
 #include <iostream>
diff --git a/lib/Fuzzer/test/InfiniteTest.cpp b/lib/Fuzzer/test/InfiniteTest.cpp
index 9f4864abdd4..ee1635d1996 100644
--- a/lib/Fuzzer/test/InfiniteTest.cpp
+++ b/lib/Fuzzer/test/InfiniteTest.cpp
@@ -1,4 +1,5 @@
 // Simple test for a fuzzer. The fuzzer must find the string "Hi!".
+#include <cstdint>
 #include <cstdlib>
 #include <cstddef>
 #include <iostream>
diff --git a/lib/Fuzzer/test/NullDerefTest.cpp b/lib/Fuzzer/test/NullDerefTest.cpp
index 602276f3c81..8811e386f9d 100644
--- a/lib/Fuzzer/test/NullDerefTest.cpp
+++ b/lib/Fuzzer/test/NullDerefTest.cpp
@@ -1,4 +1,5 @@
 // Simple test for a fuzzer. The fuzzer must find the string "Hi!".
+#include <cstdint>
 #include <cstdlib>
 #include <cstddef>
 #include <iostream>
diff --git a/lib/Fuzzer/test/SimpleTest.cpp b/lib/Fuzzer/test/SimpleTest.cpp
index 9e20d8e6ac9..adb90cebe86 100644
--- a/lib/Fuzzer/test/SimpleTest.cpp
+++ b/lib/Fuzzer/test/SimpleTest.cpp
@@ -1,4 +1,5 @@
 // Simple test for a fuzzer. The fuzzer must find the string "Hi!".
+#include <cstdint>
 #include <cstdlib>
 #include <cstddef>
 #include <iostream>
diff --git a/lib/Fuzzer/test/TimeoutTest.cpp b/lib/Fuzzer/test/TimeoutTest.cpp
index c5a8ac00579..266ead646a5 100644
--- a/lib/Fuzzer/test/TimeoutTest.cpp
+++ b/lib/Fuzzer/test/TimeoutTest.cpp
@@ -1,4 +1,5 @@
 // Simple test for a fuzzer. The fuzzer must find the string "Hi!".
+#include <cstdint>
 #include <cstdlib>
 #include <cstddef>
 #include <iostream>