fixed includes from earlier directory change