diff -Naur ocrad-0.17.org/character_r12.cc ocrad-0.17/character_r12.cc
--- ocrad-0.17.org/character_r12.cc	2008-01-07 14:11:20.548674000 +0100
+++ ocrad-0.17/character_r12.cc	2008-01-07 14:25:56.521831000 +0100
@@ -17,6 +17,7 @@
 
 #include <cstdio>
 #include <vector>
+#include <cstdlib>
 #include "common.h"
 #include "rectangle.h"
 #include "ucs.h"
diff -Naur ocrad-0.17.org/common.cc ocrad-0.17/common.cc
--- ocrad-0.17.org/common.cc	2008-01-07 14:11:20.567656000 +0100
+++ ocrad-0.17/common.cc	2008-01-07 14:12:38.117025000 +0100
@@ -18,6 +18,7 @@
 #include <algorithm>
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include "common.h"
 
 
diff -Naur ocrad-0.17.org/page_image.cc ocrad-0.17/page_image.cc
--- ocrad-0.17.org/page_image.cc	2008-01-07 14:11:20.612610000 +0100
+++ ocrad-0.17/page_image.cc	2008-01-07 14:19:52.943771000 +0100
@@ -19,6 +19,8 @@
 #include <cctype>
 #include <cstdio>
 #include <vector>
+#include <climits>
+#include <string>
 
 #include "common.h"
 #include "rational.h"
diff -Naur ocrad-0.17.org/page_image_layout.cc ocrad-0.17/page_image_layout.cc
--- ocrad-0.17.org/page_image_layout.cc	2008-01-07 14:11:20.650575000 +0100
+++ ocrad-0.17/page_image_layout.cc	2008-01-07 14:21:28.079532000 +0100
@@ -18,6 +18,7 @@
 #include <algorithm>
 #include <cstdio>
 #include <vector>
+#include <string>
 
 #include "common.h"
 #include "rational.h"
diff -Naur ocrad-0.17.org/textblock.cc ocrad-0.17/textblock.cc
--- ocrad-0.17.org/textblock.cc	2008-01-07 14:11:20.671554000 +0100
+++ ocrad-0.17/textblock.cc	2008-01-07 14:29:36.775354000 +0100
@@ -18,6 +18,7 @@
 #include <algorithm>
 #include <cstdio>
 #include <vector>
+#include <string>
 
 #include "common.h"
 #include "rational.h"
diff -Naur ocrad-0.17.org/textline.cc ocrad-0.17/textline.cc
--- ocrad-0.17.org/textline.cc	2008-01-07 14:11:20.675546000 +0100
+++ ocrad-0.17/textline.cc	2008-01-07 14:27:08.152127000 +0100
@@ -19,6 +19,7 @@
 #include <cctype>
 #include <cstdio>
 #include <vector>
+#include <string>
 
 #include "common.h"
 #include "rational.h"
diff -Naur ocrad-0.17.org/textline_r2.cc ocrad-0.17/textline_r2.cc
--- ocrad-0.17.org/textline_r2.cc	2008-01-07 14:11:20.679548000 +0100
+++ ocrad-0.17/textline_r2.cc	2008-01-07 14:28:11.473737000 +0100
@@ -17,6 +17,7 @@
 
 #include <cctype>
 #include <cstdio>
+#include <cstdlib>
 #include <vector>
 
 #include "common.h"
diff -Naur ocrad-0.17.org/textpage.cc ocrad-0.17/textpage.cc
--- ocrad-0.17.org/textpage.cc	2008-01-07 14:11:20.685540000 +0100
+++ ocrad-0.17/textpage.cc	2008-01-07 14:31:27.944066000 +0100
@@ -15,6 +15,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <algorithm>
 #include <cstdio>
 #include <string>
 #include <vector>
diff -Naur ocrad-0.17.org/track.cc ocrad-0.17/track.cc
--- ocrad-0.17.org/track.cc	2008-01-07 14:11:20.703522000 +0100
+++ ocrad-0.17/track.cc	2008-01-07 14:15:00.739270000 +0100
@@ -15,6 +15,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <cstdio>
 #include <algorithm>
 #include <vector>