v 4.2.2: fix includes for newer gcc