Fixed hardcoded header paths