[#874512] Header fixes
0.0.19