Add back missing file and include