Fix up more dependencies with @include and @requires

WIP will update when done