Header detected and inclusion improvement
C++-ify