Trying to fix header inclusion bug