removed circular dependencies in Makefile