am b82be174: Merge "Fix implicit function declarations."

* commit 'b82be17488382132602e33e1a64829e7e5358f0f':
  Fix implicit function declarations.