Cleanup files by reordering functions in order to remove need for
unnecessary function prototypes.

There are no code changes here, just functions being moved around and
prototypes being eliminated.
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>