Merge "Remove useless #defines and incorrect claims from header files."