Fix dependencies again and carbonize some more stuff

Change-Id: I97a68547bdc6a41b520bdc59bb2d34108433b07a