Cpp: Remove plural from includes
Cpp: Use menuselection