Remove stlport, collect system includes in one place