Fix major include errors and remove hook to non-existent method