Missing headers fix