This should allow merging in the project without breaking "make dist" after "make distclean". This currently requires GCC though (for "-include").