Adjust to new Module.h interface for dependent libraries