2.0.0 p5xx

Add missing headers for 2.0.0 branch