Applied 2.14.4_fix_include.diff and 2.14.4_fix_src.diff.