Unified 6 files into a clear 1.
Forgot to add depend.mk.
Merge commit 'f8b1015'