Fix cpluspluscheck for "Change gist stratnum function to use CompareType"

Fix cpluspluscheck for "Change gist stratnum function to use CompareType"

Commit 630f9a43cec introduced an enum forward declaration, which
doesn't work in C++.  To fix, just include the header file to get the
type.