diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index d8e0d27fa..cf3d692ac 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -49,7 +49,8 @@ LOCAL_MODULE_STEM_64 := bionic-benchmarks64
 LOCAL_MULTILIB := both
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_CFLAGS += $(benchmark_c_flags)
-include external/libcxx/libcxx.mk
+LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include
+LOCAL_SHARED_LIBRARIES += libstlport
 LOCAL_SRC_FILES := $(benchmark_src_files)
 include $(BUILD_EXECUTABLE)
 
diff --git a/tests/Android.build.mk b/tests/Android.build.mk
index 4019a29d0..c1a0f16af 100644
--- a/tests/Android.build.mk
+++ b/tests/Android.build.mk
@@ -77,7 +77,7 @@ LOCAL_LDLIBS := \
     $($(module)_ldlibs_$(build_type)) \
 
 ifeq ($(build_type),target)
-  include external/libcxx/libcxx.mk
+  include external/stlport/libstlport.mk
 
   include $(BUILD_$(build_target))
 endif
diff --git a/tests/Android.mk b/tests/Android.mk
index 699c93ddf..9a17c104c 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -107,9 +107,6 @@ libBionicStandardTests_src_files := \
     unistd_test.cpp \
     wchar_test.cpp \
 
-libBionicStandardTests_c_includes := \
-    bionic/libc/private \
-
 libBionicStandardTests_cflags := \
     $(test_cflags) \
 
@@ -322,9 +319,10 @@ bionic-unit-tests-static_whole_static_libraries := \
     libBionicTests \
 
 bionic-unit-tests-static_static_libraries := \
+    libstlport_static \
     libm \
     libc \
-    libc++ \
+    libstdc++ \
 
 bionic-unit-tests-static_force_static_executable := true
 
diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index a089c3a4d..58cb374cf 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -27,7 +27,7 @@
 #include "ScopedSignalHandler.h"
 
 #if defined(__BIONIC__) // mktime_tz is a bionic extension.
-#include <bionic_time.h>
+#include <libc/private/bionic_time.h>
 #endif // __BIONIC__
 
 TEST(time, mktime_tz) {