Adding includes to cstdlib in some headers file
Merge remote-tracking branch 'origin/master'