merged debian patch to make it compile with new headers