Makefiles now reference correct workspace libraries