move extra_sources earlier in signals.cpp code generation.
Merge remote-tracking branch 'origin/extra-sources-fix' into next