Changed include files for multiplatform support