diff -Naur yafray.orig/src/loader/mlex.h yafray/src/loader/mlex.h
--- yafray.orig/src/loader/mlex.h	2004-12-22 12:26:24 +0300
+++ yafray/src/loader/mlex.h	2009-05-09 19:25:37 +0400
@@ -22,8 +22,9 @@
 #ifndef __MLEX_H
 #define __MLEX_H
 
-#include<stdio.h>
-#include"lex.h"
+#include <stdio.h>
+#include <string.h>
+#include "lex.h"
 
 
 #define T_IDE 257
diff -Naur yafray.orig/src/shaders/basictex.cc yafray/src/shaders/basictex.cc
--- yafray.orig/src/shaders/basictex.cc	2006-06-10 04:41:26 +0400
+++ yafray/src/shaders/basictex.cc	2009-05-09 19:27:52 +0400
@@ -259,7 +259,7 @@
 		intp_type = BICUBIC;
 	
 	// Load image, try to determine from extensions first
-	char *ext = strrchr(filename, '.');
+	const char *ext = strrchr(filename, '.');
 	bool jpg_tried = false;
 	bool tga_tried = false;
 	bool hdr_tried = false;
diff -Naur yafray.orig/src/yafraycore/buffer.h yafray/src/yafraycore/buffer.h
--- yafray.orig/src/yafraycore/buffer.h	2005-06-27 18:11:30 +0400
+++ yafray/src/yafraycore/buffer.h	2009-05-09 19:25:37 +0400
@@ -28,6 +28,7 @@
 #endif
 
 #include <cstdio>
+#include <cstdlib>
 #include <iostream>
 #include "color.h"
 
diff -Naur yafray.orig/src/yafraycore/ccthreads.cc yafray/src/yafraycore/ccthreads.cc
--- yafray.orig/src/yafraycore/ccthreads.cc	2005-06-23 02:11:42 +0400
+++ yafray/src/yafraycore/ccthreads.cc	2009-05-09 19:25:37 +0400
@@ -1,4 +1,5 @@
 #include"ccthreads.h"
+#include<cstdlib>
 #include<iostream>
 
 using namespace std;
diff -Naur yafray.orig/src/yafraycore/geometree.h yafray/src/yafraycore/geometree.h
--- yafray.orig/src/yafraycore/geometree.h	2004-12-22 12:26:38 +0300
+++ yafray/src/yafraycore/geometree.h	2009-05-09 19:25:37 +0400
@@ -1,7 +1,8 @@
 #ifndef __GEOMETREE_H
 #define __GEOMETREE_H
 
-#include"bound.h"
+#include "bound.h"
+#include <limits>
 
 __BEGIN_YAFRAY
 
diff -Naur yafray.orig/src/yafraycore/HDR_io.h yafray/src/yafraycore/HDR_io.h
--- yafray.orig/src/yafraycore/HDR_io.h	2005-06-23 02:11:42 +0400
+++ yafray/src/yafraycore/HDR_io.h	2009-05-09 19:25:37 +0400
@@ -2,6 +2,7 @@
 #define __HDR_IO_H
 
 #include <stdio.h>
+#include <string.h>
 //#include <math.h>
 #include "color.h"
 #include "buffer.h"
diff -Naur yafray.orig/src/yafraycore/kdtree.cc yafray/src/yafraycore/kdtree.cc
--- yafray.orig/src/yafraycore/kdtree.cc	2006-07-14 13:58:05 +0400
+++ yafray/src/yafraycore/kdtree.cc	2009-05-09 19:25:37 +0400
@@ -4,6 +4,7 @@
 #include <math.h>
 #include <limits>
 #include <time.h>
+#include <string.h>
 
 __BEGIN_YAFRAY
 
diff -Naur yafray.orig/src/yafraycore/renderblock.cc yafray/src/yafraycore/renderblock.cc
--- yafray.orig/src/yafraycore/renderblock.cc	2005-05-30 10:28:19 +0400
+++ yafray/src/yafraycore/renderblock.cc	2009-05-09 19:25:37 +0400
@@ -1,5 +1,6 @@
 
 #include "renderblock.h"
+#include <cstdlib>
 
 using namespace std;
 
diff -Naur yafray.orig/src/yafraycore/targaIO.h yafray/src/yafraycore/targaIO.h
--- yafray.orig/src/yafraycore/targaIO.h	2006-05-18 19:36:08 +0400
+++ yafray/src/yafraycore/targaIO.h	2009-05-09 19:25:37 +0400
@@ -5,7 +5,7 @@
 #define __TARGAIO_H
 
 #include <stdio.h>
-#include <string>
+#include <string.h>
 #include "color.h"
 #include "buffer.h"
 #include "output.h"