Another round of stl_inc.h cleanups