Fix merge error

Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>
Reintroduced math fix for glibc 2.15
Remove math module warnings + Linux-style clean

Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>