RFR(M): 8038498: Fix includes and C inlining after 8035330

[Thomas Schatzl]

Hi Goetz,

On Tue, 2014-04-01 at 10:24 +0000, Lindenmaier, Goetz wrote:
> Sure!  I updated the webrev accordingly.

  looks good to me.

I will sponsor the change.

Thanks,
  Thomas