Issue #103: Fix dependencies in makefiles