Fix qmake warnings about incorrect header includes in public headers.

Change-Id: I4b6ff895a021665b18b007c8bd8a7059cbba3ab1
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>