- added includes patch (missing header for NULL)