am 77e8e81a: Header cleanup.  Moved a couple of functions from .h to .cpp.

* commit '77e8e81ad95cfc1eb8f8407fc872674b8d08bbe9':
  Header cleanup.  Moved a couple of functions from .h to .cpp.