diff --git a/common/Android.mk b/common/Android.mk
index e175338..b323dc2 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -143,16 +143,15 @@
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(src_files)
-LOCAL_C_INCLUDES := $(c_includes)
-LOCAL_C_INCLUDES += abi/cpp/include # RTTI
-LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include # STL
+LOCAL_C_INCLUDES += $(c_includes)
 LOCAL_CFLAGS := $(local_cflags) -DPIC -fPIC
-LOCAL_RTTI_FLAG := -frtti
-LOCAL_SHARED_LIBRARIES += libgabi++ libdl libstlport
+LOCAL_SHARED_LIBRARIES += libdl
 LOCAL_LDLIBS += $(local_ldlibs)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libicuuc
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+include abi/cpp/use_rtti.mk
+include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)
 
 
diff --git a/i18n/Android.mk b/i18n/Android.mk
index 33146dc..3572415 100644
--- a/i18n/Android.mk
+++ b/i18n/Android.mk
@@ -104,15 +104,14 @@
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(src_files)
 LOCAL_C_INCLUDES += $(c_includes)
-LOCAL_C_INCLUDES += abi/cpp/include # RTTI
-LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include # STL
 LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC
-LOCAL_RTTI_FLAG := -frtti
-LOCAL_SHARED_LIBRARIES += libicuuc libgabi++ libstlport
+LOCAL_SHARED_LIBRARIES += libicuuc
 LOCAL_LDLIBS += $(local_ldlibs)
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libicui18n
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+include abi/cpp/use_rtti.mk
+include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)