[fix] small fix to the include headers
[wip] snapshot of work