More cross platform include issues