* fix includes, must revisit OS_PATH_SEPARATOR hack