removed more include guards