Fix some dependencies/warnings in programs
6 files changed