C++ library split in multiple headers.
Merge branch 'master' into experimental