Use CSVIMP_HEADERS
Merge pull request #491 from dpocock/build-fixes-4_7_x

Use CSVIMP_HEADERS