Cleanup C++ Makefile
Add solution for #12047 Highest Paid Toll