shooter: round 1 of dependencies changes.

Change-Id: I9d2880fc71ed0585afa26e347b47b369bccd12ae