Minor fix in header files Move functions to be included in extern "C". Change-Id: If57fa5eb7955763cf99e6839dde4d7221fad75ea