base: header tweaks

Signed-off-by: Georgios Kokosioulis <georgios.kokosioulis@cern.ch>