Changes related to taglib inclusions

Signed-off-by: 77027subbu <77027subbu@gmail.com>