Removed headers dependencies on ICU, libetpan.