extract more headers

Signed-off-by: Marko Saukko <marko.saukko@jollamobile.com>