More and more stl_inc.h cleanups