HDFFV-8897: remove include extra paths.