More and more cleanups

Added some missing include guards, corrected wrong include guard names.
Removed more stl_inc.h includes.