Code cleanup: fix no previous declaration warnings

Move internally used functions to an anonymous namespace,

Change-Id: I84c98facf901e64771d131b088e20e2c033cab70
2 files changed