More reliable .d file generation