Add include guards and comments