Place non-static function prototypes in a header file. Change-Id: I7cd21b9f1e69f4e0b3338bfe27b3c67e4b47de58