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

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