--- a/README	Sat May 15 14:32:45 2010 +0100
+++ b/README	Sat May 15 18:24:04 2010 +0100
@@ -90,14 +90,14 @@
 
 * Install preqrequisities for building Raptor.
   - bison
-  - ncurses & its headers
+  - libncurses & its headers
   - libbz2 & its headers
 
 * Install the boost libraries and their headers. The upstream package bundles
 a defective copy of the boost libraries v1.39 for building the imgtools/imglib
 target. The headers of this copy compile for Windows (with one small fix)
 but are broken for Linux, so the Linux build is fixed to expect boost libraries
-from the system. v1.40 is OK.
+from the system. v1.40 is OK. (v1.35 is too old)
   
 * Install libxml2 and its headers. These are also bundled with the upstream
 package for building the imgtools/imgcheck target, but there is no target that

--- a/TODO	Sat May 15 14:32:45 2010 +0100
+++ b/TODO	Sat May 15 18:24:04 2010 +0100
@@ -11,13 +11,15 @@
 		Windows XP 32bit
 		Ubuntu 10.4 32bit
 
-3.	Find all the perl scripts that are exported and ensure they run on
+3.	Fix the package to be 32/64 bit portable. *Not easy*
+
+4.	Find all the perl scripts that are exported and ensure they run on
 	Linux.
 
-4.	Differentiate the exports so that .bat files are only exported by
+5.	Differentiate the exports so that .bat files are only exported by
 	Windows builds and .sh files are only exported by *nix builds
 
-5.	On Windows, the imgcheck target needs to link against libwsock32.a. This
+6.	On Windows, the imgcheck target needs to link against libwsock32.a. This
 	library exist in the gcc mingw lib directory in the PDT, but because
 	the library is specified with the STATICLIBRARY keyword, the linker looks
 	for it in the epoc32\release\tools2\{deb|rel} directory and doesn't find it.
@@ -28,12 +30,13 @@
 	Preferably, for all targets on Windows the gcc mingw libraries should be in
 	the linker's search path.
 
-6.	Add a toplevel GNU makefile to the package and scripting to support it which
+7.	Add a toplevel GNU makefile to the package and scripting to support it which
 	can generate a GNU tarball containing a "normalised Linux" simplification of
 	the package. The normalised Linux spin will strip out everything from the
 	package contents and build that is only required for Windows or would
 	normally be provided by package prerequisities in a Linux setting, e.g. it
 	will not contain Windows binaries or build its own versions of make, bash,
 	cpp, python. A normalised Linux spin would be the right basis on which
-	to build .deb or .rpm packaging. 
+	to build .deb or .rpm packaging.
+	
 

--- a/bintools/checklib/main.cpp	Sat May 15 14:32:45 2010 +0100
+++ b/bintools/checklib/main.cpp	Sat May 15 18:24:04 2010 +0100
@@ -22,7 +22,8 @@
 #include <sstream>
 #include <iostream>
 #include <stdexcept>
-#include <cstring>
+#include <cstring>
+#include <cstdlib>
 
 
 const char SELF_NAME[] = "checklib";

--- a/e32tools/elf2e32/source/librarytarget.cpp	Sat May 15 14:32:45 2010 +0100
+++ b/e32tools/elf2e32/source/librarytarget.cpp	Sat May 15 18:24:04 2010 +0100
@@ -20,7 +20,8 @@
 #include "librarytarget.h"
 #include "pl_dso_handler.h"
 #include "deffile.h"
-#include <iostream>
+#include <iostream>
+#include <cstdlib>
 
 /**
 Constructor for the Library Class

--- a/e32tools/elf2e32/source/messageimplementation.cpp	Sat May 15 14:32:45 2010 +0100
+++ b/e32tools/elf2e32/source/messageimplementation.cpp	Sat May 15 18:24:04 2010 +0100
@@ -23,7 +23,8 @@
 #include<iostream>
 #include<stdarg.h>
 #include<string>
-#include <cstring>
+#include <cstring>
+#include <cstdlib>
 
 
 using std::endl;

--- a/e32tools/elf2e32/source/parametermanager.cpp	Sat May 15 14:32:45 2010 +0100
+++ b/e32tools/elf2e32/source/parametermanager.cpp	Sat May 15 18:24:04 2010 +0100
@@ -24,7 +24,8 @@
 #include "pl_common.h"
 #include "parametermanager.h"
 #include "errorhandler.h"
-#include <iostream>
+#include <iostream>
+#include <cstdlib>
 
 #include "h_utl.h"
 #include "h_ver.h"

--- a/imgtools/imgcheck/libimgutils/src/e32reader.cpp	Sat May 15 14:32:45 2010 +0100
+++ b/imgtools/imgcheck/libimgutils/src/e32reader.cpp	Sat May 15 18:24:04 2010 +0100
@@ -24,6 +24,7 @@
 
 #include "e32reader.h"
 #include <f32image.h>
+#include <cstdlib>
 
 /** 
 Constructor.

--- a/imgtools/imglib/filesystem/include/filesysteminterface.h	Sat May 15 14:32:45 2010 +0100
+++ b/imgtools/imglib/filesystem/include/filesysteminterface.h	Sat May 15 18:24:04 2010 +0100
@@ -24,6 +24,7 @@
 
 #include "directory.h"
 #include <fstream>
+#include <cstdlib>
 
 typedef std::ofstream Ofstream;
 

--- a/imgtools/sisutils/src/pkgfileparser.cpp	Sat May 15 14:32:45 2010 +0100
+++ b/imgtools/sisutils/src/pkgfileparser.cpp	Sat May 15 18:24:04 2010 +0100
@@ -20,6 +20,7 @@
 #include "pkgfileparser.h"
 #include <vector>
 #include <wchar.h>
+#include <cstdlib>
 
 // Parse options lookups
 #define MAXTOKENLEN	30

--- a/imgtools/sisutils/src/sis2iby.cpp	Sat May 15 14:32:45 2010 +0100
+++ b/imgtools/sisutils/src/sis2iby.cpp	Sat May 15 18:24:04 2010 +0100
@@ -18,6 +18,7 @@
 
 #include "sisutils.h"
 #include "sis2iby.h"
+#include <cstdlib>
 
 /**
 Constructor: Sis2Iby class

--- a/imgtools/sisutils/src/sisutils.cpp	Sat May 15 14:32:45 2010 +0100
+++ b/imgtools/sisutils/src/sisutils.cpp	Sat May 15 18:24:04 2010 +0100
@@ -227,7 +227,7 @@
 			args.push_back(token);
 		}  
 	}
-	args.push_back(NULL);
+	args.push_back((char *)NULL);
     pid_t pid = fork();
     if (pid == 0)
 	{