cleanup includes and add Qt5 compatibility