headerserializers: header files renamed to unique name - continued