Added include guards more explicitly