Move some include files only needed by Visual C++