Cpp: Remove plural from includes