More changes to get a debug loader based on @requires and @include to work