cleanup include guards, some typedefs