[framework] Fixed headers construction