Misleading comment: you haven't added any calls to UnexpectedError (much less any *visible* calls to it, that someone checking this file, to see whether they still need this #include, can search for).  You're actually #include-ing it for CF_ASSERT, so the comment should mention that.