Header libs cleanup