cpp_v2 - lib: partial header cleanup