Change include paths again