rewrote dependencies to work with g++