Fixing header incluions