tools: Rearrange headers