Revert "Needs reverting"

This reverts commit 5ff79309575f9877ef16bf9b51a2627fde915de5.
Header cleanup