Rework header includes to work with gcc 4.2