Code cleanup: fix no previous declaration warnings Moved some internally used functions into an anonymous namespace. Change-Id: Ie82df61b0608abac79ccc9f7b14e7f7e04ab733d