diff --git a/system/OpenglSystemCommon/Android.mk b/system/OpenglSystemCommon/Android.mk
index f29901e..ece437c 100644
--- a/system/OpenglSystemCommon/Android.mk
+++ b/system/OpenglSystemCommon/Android.mk
@@ -51,7 +51,7 @@
 $(call emugl-export,HEADER_LIBRARIES,libhardware_headers)
 endif
 
-$(call emugl-export,C_INCLUDES,$(LOCAL_PATH) bionic/libc/private)
+$(call emugl-export,C_INCLUDES,$(LOCAL_PATH) bionic/libc/platform)
 
 ifeq (true,$(GOLDFISH_OPENGL_BUILD_FOR_HOST))
 $(call emugl-export,SHARED_LIBRARIES,android-emu-shared)
diff --git a/system/OpenglSystemCommon/ThreadInfo.cpp b/system/OpenglSystemCommon/ThreadInfo.cpp
index c432cea..9005957 100644
--- a/system/OpenglSystemCommon/ThreadInfo.cpp
+++ b/system/OpenglSystemCommon/ThreadInfo.cpp
@@ -16,8 +16,8 @@
 #include "ThreadInfo.h"
 #include "cutils/threads.h"
 
-#ifdef __ANDROID__
-#include <bionic_tls.h>
+#ifdef __BIONIC__
+#include <bionic/tls.h>
 #endif
 #include <pthread.h>
 
diff --git a/system/egl/Android.mk b/system/egl/Android.mk
index de2bd3d..58663e5 100644
--- a/system/egl/Android.mk
+++ b/system/egl/Android.mk
@@ -30,9 +30,6 @@
 LOCAL_SHARED_LIBRARIES += libnativewindow
 endif
 
-# Used to access the Bionic private OpenGL TLS slot
-LOCAL_C_INCLUDES += bionic/libc/private
-
 endif # !GOLDFISH_OPENGL_BUILD_FOR_HOST
 
 $(call emugl-end-module)
diff --git a/system/gralloc/Android.mk b/system/gralloc/Android.mk
index d3227f2..e671160 100644
--- a/system/gralloc/Android.mk
+++ b/system/gralloc/Android.mk
@@ -14,8 +14,6 @@
 LOCAL_SRC_FILES := gralloc.cpp
 
 ifneq (true,$(GOLDFISH_OPENGL_BUILD_FOR_HOST))
-# Need to access the special OPENGL TLS Slot
-LOCAL_C_INCLUDES += bionic/libc/private
 LOCAL_SHARED_LIBRARIES += libdl
 endif