Staging: sep: Fix build problems from header changes