minor include changes for cross-compatibility in linux/win32 builds