(fix) Don't const-qualify functions that return by value
(fix) Don't const-qualify functions that return by value

Nice catch via sonarcloud. Also remove unused includes.

acgetchell/CDT-plusplus,acgetchell/CDT-plusplus,acgetchell/CDT-plusplus