Fixed include guards and section formatting