--- sword-1.5.9.orig/include/flatapi.h	2007-04-04 11:52:31.000000000 +0000
+++ sword-1.5.9/include/flatapi.h	2007-04-04 11:53:30.000000000 +0000
@@ -27,6 +27,8 @@
 #ifdef __cplusplus
 #endif
 
+#include <stdint.h>
+
 extern "C" {
 
 #define SWHANDLE intptr_t
--- sword-1.5.9.orig/src/modules/filters/gbfwordjs.cpp	2007-04-04 11:49:30.000000000 +0000
+++ sword-1.5.9/src/modules/filters/gbfwordjs.cpp	2007-04-04 11:49:45.000000000 +0000
@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <gbfwordjs.h>
 #include <swmodule.h>
+#include <stdio.h>
 #include <ctype.h>
 #include <utilstr.h>
 #include <versekey.h>
--- sword-1.5.9.orig/utilities/diatheke/corediatheke.h	2007-04-04 11:54:34.000000000 +0000
+++ sword-1.5.9/utilities/diatheke/corediatheke.h	2007-04-04 11:54:42.000000000 +0000
@@ -4,6 +4,7 @@
 // see accompanying LICENSE file for license details
 
 #include <stdio.h>
+#include <ostream>
 
 #include "diathekemgr.h"
 #include <localemgr.h>
--- sword-1.5.9.orig/utilities/diatheke/osiscgi.cpp	2007-04-04 11:56:04.000000000 +0000
+++ sword-1.5.9/utilities/diatheke/osiscgi.cpp	2007-04-04 11:56:16.000000000 +0000
@@ -14,6 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <cctype>
 #include <stdlib.h>
 #include "osiscgi.h"
 #include <utilxml.h>
--- sword-1.5.9.orig/utilities/stepdump.cpp	2007-04-04 12:01:41.000000000 +0000
+++ sword-1.5.9/utilities/stepdump.cpp	2007-04-04 12:01:49.000000000 +0000
@@ -1,3 +1,4 @@
+#include <cstdlib>
 #include <iostream>
 #include <string>
 
--- sword-1.5.9.orig/utilities/step2vpl.cpp	2007-04-04 12:02:47.000000000 +0000
+++ sword-1.5.9/utilities/step2vpl.cpp	2007-04-04 12:02:52.000000000 +0000
@@ -1,3 +1,4 @@
+#include <cstdlib>
 #include <iostream>
 #include <string>
 #include <stdio.h>


diff -urNad sword-1.5.9.orig/utilities/step2vpl.cpp sword-1.5.9/utilities/step2vpl.cpp
--- sword-1.5.9.orig/utilities/step2vpl.cpp	2008-04-10 02:11:24.000000000 +0100
+++ sword-1.5.9/utilities/step2vpl.cpp	2008-04-10 02:14:03.000000000 +0100
@@ -1,5 +1,6 @@
 #include <iostream>
 #include <string>
+#include <cstring>
 #include <stdio.h>
 
 #include <fcntl.h>
diff -urNad sword-1.5.9.orig/utilities/stepdump.cpp sword-1.5.9/utilities/stepdump.cpp
--- sword-1.5.9.orig/utilities/stepdump.cpp	2008-04-10 02:11:24.000000000 +0100
+++ sword-1.5.9/utilities/stepdump.cpp	2008-04-10 02:12:49.000000000 +0100
@@ -1,5 +1,6 @@
 #include <iostream>
 #include <string>
+#include <cstring>
 
 #include <fcntl.h>