Clean up includes for Windows build