fixed arragements include guards