diff -NrU5 octave-forge-2006.03.17.orig/extra/graceplot/__grcmd__.cc octave-forge-2006.03.17/extra/graceplot/__grcmd__.cc
--- octave-forge-2006.03.17.orig/extra/graceplot/__grcmd__.cc	2005-05-25 05:43:38.000000000 +0200
+++ octave-forge-2006.03.17/extra/graceplot/__grcmd__.cc	2008-04-26 23:49:44.000000000 +0200
@@ -34,10 +34,11 @@
 #include <sys/wait.h>
 #include <strings.h>
 #include <errno.h>
 #include <limits.h>
 #include <string>
+#include <cstring>
 #include <map>
 #ifndef OPEN_MAX
 #  define OPEN_MAX 256
 #endif
 
diff -NrU5 octave-forge-2006.03.17.orig/extra/mex/mex.cc octave-forge-2006.03.17/extra/mex/mex.cc
--- octave-forge-2006.03.17.orig/extra/mex/mex.cc	2004-07-08 06:56:03.000000000 +0200
+++ octave-forge-2006.03.17/extra/mex/mex.cc	2008-04-26 23:53:19.000000000 +0200
@@ -24,10 +24,11 @@
 
 #include <cfloat>
 #include <iomanip>
 #include <set>
 #include <string>
+#include <cstring>
 typedef void * Pix;
 typedef std::set<Pix> MemSet;
 
 extern "C" {
 #include <cstdlib>
diff -NrU5 octave-forge-2006.03.17.orig/extra/pdb/creadpdb.cc octave-forge-2006.03.17/extra/pdb/creadpdb.cc
--- octave-forge-2006.03.17.orig/extra/pdb/creadpdb.cc	2006-01-08 06:47:57.000000000 +0100
+++ octave-forge-2006.03.17/extra/pdb/creadpdb.cc	2008-04-26 23:54:01.000000000 +0200
@@ -18,10 +18,11 @@
 #include <octave/oct-map.h>
 #include <octave/ov-str-mat.h>
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <cstring>
 #include <fcntl.h>
 
 #define BUFLEN 80
 
 inline double strntod(const char* startptr, int n)
diff -NrU5 octave-forge-2006.03.17.orig/FIXES/oct-sort.cc octave-forge-2006.03.17/FIXES/oct-sort.cc
--- octave-forge-2006.03.17.orig/FIXES/oct-sort.cc	2004-01-25 16:17:25.000000000 +0100
+++ octave-forge-2006.03.17/FIXES/oct-sort.cc	2008-04-27 00:09:51.000000000 +0200
@@ -83,10 +83,11 @@
 
 #include <octave/oct.h>
 #include <octave/lo-mappers.h>
 #include <octave/config.h>
 #include <octave/quit.h>
+#include <cstring>
 #include "oct-sort.h"
 
 #define IFLT(a,b)  if (compare == NULL ? ((a) < (b)) : compare ((a), (b)))
 
 template <class T>
diff -NrU5 octave-forge-2006.03.17.orig/FIXES/sort.cc octave-forge-2006.03.17/FIXES/sort.cc
--- octave-forge-2006.03.17.orig/FIXES/sort.cc	2004-04-28 10:55:14.000000000 +0200
+++ octave-forge-2006.03.17/FIXES/sort.cc	2008-04-26 23:52:10.000000000 +0200
@@ -25,10 +25,11 @@
 #include <octave/config.h>
 #include <octave/quit.h>
 #include <octave/lo-ieee.h>
 #include <octave/data-conv.h>
 #include <octave/ov-cx-mat.h>
+#include <cstring>
 #include "oct-sort.cc"
 
 // ======= Cruft to support ancient versions of Octave =========
 #ifndef OCTAVE_LOCAL_BUFFER
 #include <vector>
diff -NrU5 octave-forge-2006.03.17.orig/main/comm/gf.cc octave-forge-2006.03.17/main/comm/gf.cc
--- octave-forge-2006.03.17.orig/main/comm/gf.cc	2005-10-12 20:47:48.000000000 +0200
+++ octave-forge-2006.03.17/main/comm/gf.cc	2008-04-26 23:55:02.000000000 +0200
@@ -47,10 +47,11 @@
 */
 
 #include "galois.h"
 #include "ov-galois.h"
 #include <octave/utils.h>
+#include <cstring>
 #include <octave/variables.h>
 
 #ifndef OCTAVE_LOCAL_BUFFER
 #include <vector>
 #define OCTAVE_LOCAL_BUFFER(T, buf, size) \
diff -NrU5 octave-forge-2006.03.17.orig/main/fixed/fixedComplex.cc octave-forge-2006.03.17/main/fixed/fixedComplex.cc
--- octave-forge-2006.03.17.orig/main/fixed/fixedComplex.cc	2004-07-06 22:55:23.000000000 +0200
+++ octave-forge-2006.03.17/main/fixed/fixedComplex.cc	2008-04-27 00:01:13.000000000 +0200
@@ -23,10 +23,11 @@
 
 */
 
 #include <complex>
 #include <cmath>
+#include <cstdlib>
 #include "int/fixed.h"
 #include "fixedComplex.h"
 
 #if !defined (CXX_ISO_COMPLIANT_LIBRARY)
 #error "Need ISO compliant C++ libraries. Try a more recent compiler!!!"
diff -NrU5 octave-forge-2006.03.17.orig/main/miscellaneous/listen.cc octave-forge-2006.03.17/main/miscellaneous/listen.cc
--- octave-forge-2006.03.17.orig/main/miscellaneous/listen.cc	2005-11-16 22:41:07.000000000 +0100
+++ octave-forge-2006.03.17/main/miscellaneous/listen.cc	2008-04-26 23:59:17.000000000 +0200
@@ -9,10 +9,11 @@
 #include <cstdio>
 #include <cctype>
 #include <cstdlib>
 #include <unistd.h>
 #include <cerrno>
+#include <cstring>
 // #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff -NrU5 octave-forge-2006.03.17.orig/main/miscellaneous/mfilename.cc octave-forge-2006.03.17/main/miscellaneous/mfilename.cc
--- octave-forge-2006.03.17.orig/main/miscellaneous/mfilename.cc	2005-12-21 21:42:40.000000000 +0100
+++ octave-forge-2006.03.17/main/miscellaneous/mfilename.cc	2008-04-26 23:58:31.000000000 +0200
@@ -20,10 +20,11 @@
 */
 
 //#ifdef HAVE_CONFIG_H
 #include <config.h>
 //#endif
+#include <algorithm>
 
 #include "defun-dld.h"
 #include "error.h"
 #include "gripes.h"
 #include "oct-obj.h"
diff -NrU5 octave-forge-2006.03.17.orig/main/plot/graphics.cc octave-forge-2006.03.17/main/plot/graphics.cc
--- octave-forge-2006.03.17.orig/main/plot/graphics.cc	2004-01-12 08:39:09.000000000 +0100
+++ octave-forge-2006.03.17/main/plot/graphics.cc	2008-04-27 00:00:18.000000000 +0200
@@ -9,10 +9,11 @@
 /*
  * Graphics extention for hacking gnuplot on X11
  */
 
 #include <string>
+#include <cstring>
 
 #include <octave/oct.h>
 #include <octave/toplev.h>
 #include <octave/parse.h>