More fix to cpp and h file build stops