diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 8021d8c..99f8c1e 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -1,5 +1,5 @@
 # eglibc:
-require conf/distro/include/eglibc.inc
+require conf/distro/include/tclibc-eglibc.inc
 
 ANGSTROM_BLACKLIST_pn-libiconv = "the eglibc provided iconv library is used"
 
@@ -18,18 +18,3 @@ FULL_OPTIMIZATION_pn-perl = "-O1 -g"
 
 TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'mips64', 'mips64el']]}"
 
-CXXFLAGS += "-fvisibility-inlines-hidden"
-
-LIBC_DEPENDENCIES = "libsegfault \
-             eglibc \
-             eglibc-dbg \
-             eglibc-dev \
-             eglibc-utils \
-             eglibc-thread-db \
-             eglibc-localedata-i18n \
-             eglibc-gconv-ibm850 \
-             eglibc-gconv-cp1252 \
-             eglibc-gconv-iso8859-1 \
-             eglibc-gconv-iso8859-15 \
-             locale-base-en-gb "
-
diff --git a/conf/distro/include/eglibc.inc b/conf/distro/include/eglibc.inc
index f33d38f..b65d6c4 100644
--- a/conf/distro/include/eglibc.inc
+++ b/conf/distro/include/eglibc.inc
@@ -1,5 +1,4 @@
-# Add glibc overrides to the overrides for eglibc.
-OVERRIDES =. "libc-glibc:"
+require conf/distro/include/tclibc-eglibc.inc
 
 # The things eglibc can provide.  We default to wanting eglibc to provide them.
 PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"