Finished fixing header guards