Some forward declaration changes

isWholeWordMatch was used by a function before it was declared, so the
code would not compile.