Added missing CSTR_ definitions.