These headers are needed for new full config

Change-Id: I008add23e8d97aee4a7cc3accc42766da0ccfe93
Signed-off-by: David Greaves <david.greaves@jollamobile.com>