Some headers cleanup