Correcting #ifdef identifiers not matching c++ specification. Closes issues #2