Fix up more dependencies with @include and @requires

Now done, I don't think this requires any more review since @marcjansen already indicated he was fine with the changes in the old ticket.