Fix build on Windows and clean up includes