More preparatory work: remove the <windows.h> include from lots of