issue: #440936 make 'for_next' branch c++ compatible - handle file that is not built regularily

Change-Id: I5b8661c0fd4c63fd665bfeb0f92c9597b54c792f