Correct inconsistent #includes in *.cpp