Changed headers to use ifdef include guards