simplify all.h in preparation for qt5