[PATCH 2/4] include: Remove workarounds for using host headers without USE_WS_PREFIX.