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

* commit 'd3bf954e9ffbdee8d732ccb6ad6143dc31b605fc':
  Remove useless #defines and incorrect claims from header files.