fix inter-module dependencies.
Merge branch 'master' into battery