Garderning 37 : Fix Linux build.

Mostly basic API changes.