[x] Fix considering that all headers should be explicitely added