Update header comments
Fix preprocessor definition