Simplify inclusion and forwarding