fix a number of bad include guards