Fix header files that are not self-sufficient

Signed-off-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm>