Use latest upstream preprocessor headers to prevent issues if overwritting files on make install in common include dirs