Merge pull request #135 from szabadka/master

Fix malloc.h and stdlib.h includes.