c8c9ceea67
into the contrib directory are still necessary for some of the Makefiles, because the C-sources there use non-canonical includes ("" includes) to get at the header files.