Revert "Adding files missing from last commit." This patch breaks the build for MSVC.
This reverts commit 929ce607e9cd8019fdbe6bc49822474deee9b745.