fix build issues when in isolation by moving more stuff into make_library