Tidied up includes/imports parsing in preparation for improvements
Visual C++ builds for i386 by default, not current platform