Add self dependencies.

Fixes #5157
Fixes #5328
remove guide accidently added to 2-3-stable.