Index: compiler-rt/trunk/lib/fuzzer/tests/CMakeLists.txt
===================================================================
--- compiler-rt/trunk/lib/fuzzer/tests/CMakeLists.txt
+++ compiler-rt/trunk/lib/fuzzer/tests/CMakeLists.txt
@@ -75,6 +75,8 @@
   set_target_properties(FuzzerUnitTests PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 
+  list(APPEND LIBFUZZER_UNITTEST_CFLAGS -I${COMPILER_RT_SOURCE_DIR}/lib/fuzzer/utils)
+
   set(FuzzedDataProviderTestObjects)
   generate_compiler_rt_tests(FuzzedDataProviderTestObjects
     FuzzedDataProviderUnitTests "FuzzerUtils-${arch}-Test" ${arch}
Index: compiler-rt/trunk/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp
===================================================================
--- compiler-rt/trunk/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp
+++ compiler-rt/trunk/lib/fuzzer/tests/FuzzedDataProviderUnittest.cpp
@@ -6,7 +6,7 @@
 #include <cstdint>
 #include <cstdlib>
 
-#include "utils/FuzzedDataProvider.h"
+#include "FuzzedDataProvider.h"
 
 // The test is intentionally extensive, as behavior of |FuzzedDataProvider| must
 // not be broken, given than many fuzz targets depend on it. Changing the