-I${BUILD_DIR}/.. doesn't work when BUILD_DIR != "unix". 
Reported by Matthias Kraft
merge trunk