WIP: Make library dependencies clearer in build system