Fixing build, removed declarations in header

Change-Id: I5f0b4aa9faad55eef09aefedd59cfc23826befa4
2 files changed