even more headers cleanup