Halfway on header-only toolkit libs
Builds without errors now