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