When generating dependencies, look for both source files _and_ interface files. If STABLE is still a branch with a future, I'd encourage merging.