Merge "Cleanup some docs (includes/*.php)"