fix compile with g++/linux
further cleanup of expression related headers