remove unnecessary includes
fix filling of stub width and offset in Endcap