add and clean up a few include guards