--- src/loader/mlex.cc
+++ src/loader/mlex.cc
@@ -31,6 +31,8 @@
 #define WARNING cerr<<"[Warning]: "
 #define ERROR cerr<<"[Error]: "
 
+#include <cstring>
+
 char sops[]={
 				'<',
 				'>',
--- src/shaders/basictex.cc
+++ src/shaders/basictex.cc
@@ -31,6 +31,8 @@
 #include "EXR_io.h"
 #endif
 
+#include <cstring>
+
 using namespace std;
 
 __BEGIN_YAFRAY
--- src/yafraycore/HDR_io.cc
+++ src/yafraycore/HDR_io.cc
@@ -9,6 +9,8 @@
 #include<config.h>
 #endif
 
+#include <cstring>
+
 __BEGIN_YAFRAY
 
 //---------------------------------------------------------------------------
--- src/yafraycore/buffer.h
+++ src/yafraycore/buffer.h
@@ -31,6 +31,8 @@
 #include <iostream>
 #include "color.h"
 
+#include <cstdlib>
+
 __BEGIN_YAFRAY
 
 template<typename T1, unsigned char T2>
--- src/yafraycore/ccthreads.cc
+++ src/yafraycore/ccthreads.cc
@@ -1,6 +1,8 @@
 #include"ccthreads.h"
 #include<iostream>
 
+#include <cstdlib>
+
 using namespace std;
 
 namespace yafthreads {
--- src/yafraycore/geometree.h
+++ src/yafraycore/geometree.h
@@ -1,6 +1,8 @@
 #ifndef __GEOMETREE_H
 #define __GEOMETREE_H
 
+#include <limits>
+
 #include"bound.h"
 
 __BEGIN_YAFRAY
--- src/yafraycore/renderblock.cc
+++ src/yafraycore/renderblock.cc
@@ -1,6 +1,8 @@
 
 #include "renderblock.h"
 
+#include <cstdlib>
+
 using namespace std;
 
 __BEGIN_YAFRAY
--- src/yafraycore/kdtree.cc
+++ src/yafraycore/kdtree.cc
@@ -4,6 +4,7 @@
 #include <math.h>
 #include <limits>
 #include <time.h>
+#include <cstring>
 
 __BEGIN_YAFRAY
 
--- src/yafraycore/targaIO.cc
+++ src/yafraycore/targaIO.cc
@@ -3,6 +3,7 @@
 //--------------------------------------------------------------------------------
 #include "targaIO.h"
 #include "vector3d.h"
+#include <cstring>
 
 //--------------------------------------------------------------------------------
 // Save uncompressed 24 bit targa