issue #4674: Re-added deleted source files.

(cherry-picked from 8cbcf171634631cf0287df15aed065b863e6dabc)

Conflicts:
	tests/cpp-tests/proj.win32/cpp-tests.vcxproj
	tests/cpp-tests/proj.win32/cpp-tests.vcxproj.filters