Got rid of the old-way include guards.