Some more cleanups
Finished removing stl_inc.h ;)
Fixed build for visual studio