Header file reshuffle and trivia