Fix includes. Try to make it compile under windows

Authored by mlaurent on May 10 2020, 9:06 AM.