Bug#1071335: upstream commits

[James Cameron]

You may be interested in these upstream commits;

b01478d ("Fix some parts of macro expansion are not guarded")
0194b80 ("strerror and memset require string.h")