Merge change Ibd7b43bb into eclair-mr2

* changes:
  Separated private from public header files.