Include guard cleanup...