[z2018] Remove more header includes

(based on commit c40c7d7)

(cleaned version of b80cf44)

(based on commit [s1625] - 1ec3d22)