--- src/lisp/lisp.cpp	2007-09-14 07:43:03.000000000 +0200
+++ src/lisp/lisp.cpp~	2010-09-26 18:05:38.000000000 +0200
@@ -18,6 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "lisp.hpp"
+#include <cstdio>
 
 namespace lisp
 {

--- src/lisp/lexer.cpp	2007-09-14 08:43:03.000000000 +0300
+++ src/lisp/lexer.cpp~	2008-10-10 12:10:13.000000000 +0200
@@ -19,6 +19,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <sstream>
 #include <stdexcept>
+#include <cstring>
+#include <cstdio>
 
 #include "lexer.hpp"
 #include "translation.hpp"

--- src/lisp/parser.cpp	2007-09-14 08:43:03.000000000 +0300
+++ src/lisp/parser.cpp~	2008-10-10 12:13:01.000000000 +0200
@@ -20,7 +20,7 @@
 #include <sstream>
 #include <stdexcept>
 #include <fstream>
-
+#include <cstring>
 #include <cassert>
 
 #include "parser.hpp"
 
--- src/ui/menusystem.cpp	2007-09-14 08:43:03.000000000 +0300
+++ src/ui/menusystem.cpp~	2008-10-10 12:15:30.000000000 +0200
@@ -1,7 +1,7 @@
 #include <iostream>
 
-#include "settings.h"
-#include "canvas.h"
+#include "../settings.h"
+#include "../canvas.h"
 
 #include "menusystem.h"
 #include "menu.h"
 
--- src/menumanager.h	2007-09-14 08:43:03.000000000 +0300
+++ src/menumanager.h~	2008-10-10 12:59:21.000000000 +0200
@@ -7,6 +7,8 @@
 #ifndef MENUMANAGER_H
 #define MENUMANAGER_H
 
+#include "ui/menuaction.h"
+
 class Main;
 
 class ControlOptions;
 
--- src/sdl_driver.cpp	2008-10-13 22:29:56.000000000 +0200
+++ src/sdl_driver.cpp~	2008-10-13 22:29:40.000000000 +0200
@@ -5,6 +5,7 @@
 #include <SDL/SDL.h>
 #include <SDL/SDL_ttf.h>
 #include <cstdio>
+#include <cstdlib> 
 
 #include "sdl_driver.h"
 #include "canvas.h"
 
--- src/videooptions.cpp	2007-09-14 08:43:03.000000000 +0300
+++ src/videooptions.cpp~	2008-10-10 12:46:10.000000000 +0200
@@ -1,5 +1,6 @@
 #include <vector>
 #include <sstream>
+#include <algorithm>
 
 #include <SDL/SDL.h>