updated and cleanded up some foundation include code.