am 28af587a: am c642199d: Merge change Ibd7b43bb into eclair-mr2

Merge commit '28af587a0587bc3975230a9ed4a2a44be1f31ad3'

* commit '28af587a0587bc3975230a9ed4a2a44be1f31ad3':
  Separated private from public header files.