C++ library split in multiple headers.
Added missing headers after the refactory...
Merge branch 'master' into experimental