Hierarchical header size changes
optimizing imports for Gitools