Add header directories and dependencies for PreCompound
Fix: wrong module names in granular dependencies