Renamed some #ifndef/#define s