diff -Nur -x '*.orig' -x '*~' dictconv-0.2/src/babylon.cpp dictconv-0.2.new/src/babylon.cpp
--- dictconv-0.2/src/babylon.cpp	2007-03-02 16:43:00.000000000 +0100
+++ dictconv-0.2.new/src/babylon.cpp	2008-06-19 14:45:55.000000000 +0200
@@ -22,6 +22,7 @@
 
 #include<stdlib.h>
 #include<stdio.h>
+#include<cstring>
 
 #include <iconv.h>
 
diff -Nur -x '*.orig' -x '*~' dictconv-0.2/src/dictdbuilder.cpp dictconv-0.2.new/src/dictdbuilder.cpp
--- dictconv-0.2/src/dictdbuilder.cpp	2007-02-25 15:33:33.000000000 +0100
+++ dictconv-0.2.new/src/dictdbuilder.cpp	2008-06-19 14:47:55.000000000 +0200
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "dictdbuilder.h"
-
+#include <cstring>
 #include <iostream>
 
 DictdBuilder::DictdBuilder( std::string filename )
diff -Nur -x '*.orig' -x '*~' dictconv-0.2/src/dictdbuilder.h dictconv-0.2.new/src/dictdbuilder.h
--- dictconv-0.2/src/dictdbuilder.h	2007-02-25 15:33:33.000000000 +0100
+++ dictconv-0.2.new/src/dictdbuilder.h	2008-06-19 14:51:19.000000000 +0200
@@ -22,6 +22,8 @@
 
 #include "dictbuilder.h"
 
+#include <sys/types.h>
+
 #include <map>
 #include <fstream>
 
diff -Nur -x '*.orig' -x '*~' dictconv-0.2/src/plaintextdictbuilder.h dictconv-0.2.new/src/plaintextdictbuilder.h
--- dictconv-0.2/src/plaintextdictbuilder.h	2007-02-19 18:22:48.000000000 +0100
+++ dictconv-0.2.new/src/plaintextdictbuilder.h	2008-06-19 14:51:13.000000000 +0200
@@ -23,6 +23,8 @@
 
 #include "dictbuilder.h"
 
+#include <sys/types.h>
+
 #include <fstream>
 #include <map>
 
diff -Nur -x '*.orig' -x '*~' dictconv-0.2/src/sdict.h dictconv-0.2.new/src/sdict.h
--- dictconv-0.2/src/sdict.h	2007-02-17 15:48:04.000000000 +0100
+++ dictconv-0.2.new/src/sdict.h	2008-06-19 14:52:26.000000000 +0200
@@ -24,6 +24,8 @@
 #include <fstream>
 #include <vector>
 
+#include <sys/types.h>
+
 using namespace std;
 
 typedef unsigned char uchar;
diff -Nur -x '*.orig' -x '*~' dictconv-0.2/src/stardictbuilder.h dictconv-0.2.new/src/stardictbuilder.h
--- dictconv-0.2/src/stardictbuilder.h	2007-02-17 15:48:04.000000000 +0100
+++ dictconv-0.2.new/src/stardictbuilder.h	2008-06-19 14:57:33.000000000 +0200
@@ -25,6 +25,8 @@
 #include <map>
 #include <fstream>
 
+#include <cstdlib>
+
 class StarDictBuilder : public DictBuilder
 {
 
diff -Nur -x '*.orig' -x '*~' dictconv-0.2/src/stardict.cpp dictconv-0.2.new/src/stardict.cpp
--- dictconv-0.2/src/stardict.cpp	2007-02-17 15:48:04.000000000 +0100
+++ dictconv-0.2.new/src/stardict.cpp	2008-06-19 14:55:59.000000000 +0200
@@ -21,6 +21,11 @@
 
 #include <zlib.h>
 
+#include <cstring>
+
+#include <cstdlib>
+
+
 #define CHUNK 0xffffL
 
 StarDict::StarDict( const char *filename )
diff -Nur -x '*.orig' -x '*~' dictconv-0.2/src/stardict.h dictconv-0.2.new/src/stardict.h
--- dictconv-0.2/src/stardict.h	2007-02-17 15:48:04.000000000 +0100
+++ dictconv-0.2.new/src/stardict.h	2008-06-19 14:53:42.000000000 +0200
@@ -24,6 +24,8 @@
 #include <fstream>
 #include <vector>
 
+#include <sys/types.h>
+
 using namespace std;
 
 /**