fixing include guards and labeling includes