Fix broken headers