Headers inclusion and init functions changed.