Cpp: Remove plural from includes
Cpp: Use menuselection
Merge pull request #433 from hflynn/rebased/develop/minor_tidying

Minor tidying (rebased onto develop)
merge develop -D org -I include -E exclude: PR 369 (Cpp: Correct content and markup)