[PATCH 13/13] opencsd: Linux and windows build updates