Fixes mess with header includes