Merge "Make android_get_application_target_sdk_version available to the NDK."
diff --git a/benchmarks/property_benchmark.cpp b/benchmarks/property_benchmark.cpp
index 9251a05..77814bf 100644
--- a/benchmarks/property_benchmark.cpp
+++ b/benchmarks/property_benchmark.cpp
@@ -21,7 +21,7 @@
#include <string>
-#include <android-base/test_utils.h>
+#include <android-base/file.h>
using namespace std::literals;
diff --git a/benchmarks/stdio_benchmark.cpp b/benchmarks/stdio_benchmark.cpp
index 21d9dc0..037bbd9 100644
--- a/benchmarks/stdio_benchmark.cpp
+++ b/benchmarks/stdio_benchmark.cpp
@@ -20,7 +20,7 @@
#include <stdio_ext.h>
#include <stdlib.h>
-#include <android-base/test_utils.h>
+#include <android-base/file.h>
#include <benchmark/benchmark.h>
#include "util.h"
diff --git a/linker/tests/Android.mk b/linker/tests/Android.mk
index 8284bea..9268e31 100644
--- a/linker/tests/Android.mk
+++ b/linker/tests/Android.mk
@@ -51,6 +51,6 @@
../linker_config.cpp \
../linker_utils.cpp \
-LOCAL_STATIC_LIBRARIES += libasync_safe libbase
+LOCAL_STATIC_LIBRARIES += libasync_safe libbase liblog
include $(BUILD_NATIVE_TEST)
diff --git a/linker/tests/linker_config_test.cpp b/linker/tests/linker_config_test.cpp
index 9260351..14fd132 100644
--- a/linker/tests/linker_config_test.cpp
+++ b/linker/tests/linker_config_test.cpp
@@ -37,10 +37,9 @@
#include <unistd.h>
+#include <android-base/file.h>
#include <android-base/scopeguard.h>
#include <android-base/stringprintf.h>
-#include <android-base/file.h>
-#include <android-base/test_utils.h>
#if defined(__LP64__)
#define ARCH_SUFFIX "64"
diff --git a/tests/system_properties_test.cpp b/tests/system_properties_test.cpp
index 949019f..3b50896 100644
--- a/tests/system_properties_test.cpp
+++ b/tests/system_properties_test.cpp
@@ -24,7 +24,7 @@
#include <string>
#include <thread>
-#include <android-base/test_utils.h>
+#include <android-base/file.h>
using namespace std::literals;