Fix qmake and compiler warnings

Public headers should not include local header files (qmake warning)
and fix warning about unused parameter.

Change-Id: Id12d2255f6011507649b25ed2bc74356e0f4538e
Reviewed-by: Stuart Burge <sburge@blackberry.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>