diff -urN lshw-B.02.12.01-orig/src/core/blockio.cc lshw-B.02.12.01/src/core/blockio.cc
--- lshw-B.02.12.01-orig/src/core/blockio.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/blockio.cc	2008-03-20 22:00:23.000000000 +0300
@@ -11,6 +11,7 @@
 #include "blockio.h"
 #include "osutils.h"
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff -urN lshw-B.02.12.01-orig/src/core/cdrom.cc lshw-B.02.12.01/src/core/cdrom.cc
--- lshw-B.02.12.01-orig/src/core/cdrom.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/cdrom.cc	2008-03-20 22:00:44.000000000 +0300
@@ -23,6 +23,7 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <limits.h>
 #include <linux/cdrom.h>
 
 __ID("@(#) $Id: cdrom.cc 1907 2007-10-13 22:23:16Z lyonel $");
diff -urN lshw-B.02.12.01-orig/src/core/cpuid.cc lshw-B.02.12.01/src/core/cpuid.cc
--- lshw-B.02.12.01-orig/src/core/cpuid.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/cpuid.cc	2008-03-20 22:01:05.000000000 +0300
@@ -1,6 +1,7 @@
 #include "version.h"
 #include "cpuid.h"
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
diff -urN lshw-B.02.12.01-orig/src/core/cpuinfo.cc lshw-B.02.12.01/src/core/cpuinfo.cc
--- lshw-B.02.12.01-orig/src/core/cpuinfo.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/cpuinfo.cc	2008-03-20 22:01:43.000000000 +0300
@@ -6,6 +6,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <vector>
 
 __ID("@(#) $Id: cpuinfo.cc 1907 2007-10-13 22:23:16Z lyonel $");
diff -urN lshw-B.02.12.01-orig/src/core/device-tree.cc lshw-B.02.12.01/src/core/device-tree.cc
--- lshw-B.02.12.01-orig/src/core/device-tree.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/device-tree.cc	2008-03-20 22:02:17.000000000 +0300
@@ -15,7 +15,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 #include <dirent.h>
 
diff -urN lshw-B.02.12.01-orig/src/core/fb.cc lshw-B.02.12.01/src/core/fb.cc
--- lshw-B.02.12.01-orig/src/core/fb.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/fb.cc	2008-03-20 22:02:47.000000000 +0300
@@ -12,6 +12,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <string.h>
 #include <errno.h>
 
 __ID("@(#) $Id: fb.cc 1907 2007-10-13 22:23:16Z lyonel $");
diff -urN lshw-B.02.12.01-orig/src/core/hw.cc lshw-B.02.12.01/src/core/hw.cc
--- lshw-B.02.12.01-orig/src/core/hw.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/hw.cc	2008-03-20 22:03:20.000000000 +0300
@@ -4,12 +4,14 @@
 #include "version.h"
 #include "options.h"
 #include "heuristics.h"
+#include <cstring>
 #include <vector>
 #include <map>
 #include <sstream>
 #include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <limits.h>
 #include <unistd.h>
 #include <sys/utsname.h>
 
diff -urN lshw-B.02.12.01-orig/src/core/ide.cc lshw-B.02.12.01/src/core/ide.cc
--- lshw-B.02.12.01-orig/src/core/ide.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/ide.cc	2008-03-20 22:03:52.000000000 +0300
@@ -23,6 +23,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 #include <dirent.h>
 #include <ctype.h>
 #include <vector>
diff -urN lshw-B.02.12.01-orig/src/core/ideraid.cc lshw-B.02.12.01/src/core/ideraid.cc
--- lshw-B.02.12.01-orig/src/core/ideraid.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/ideraid.cc	2008-03-20 22:04:17.000000000 +0300
@@ -17,6 +17,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <string.h>
 #include <dirent.h>
 #include <ctype.h>
 #include <vector>
diff -urN lshw-B.02.12.01-orig/src/core/lvm.cc lshw-B.02.12.01/src/core/lvm.cc
--- lshw-B.02.12.01-orig/src/core/lvm.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/lvm.cc	2008-03-20 22:04:36.000000000 +0300
@@ -12,6 +12,7 @@
 #include "version.h"
 #include "lvm.h"
 #include "osutils.h"
+#include <string.h>
 
 __ID("@(#) $Id: lvm.cc 1907 2007-10-13 22:23:16Z lyonel $");
 
diff -urN lshw-B.02.12.01-orig/src/core/mounts.cc lshw-B.02.12.01/src/core/mounts.cc
--- lshw-B.02.12.01-orig/src/core/mounts.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/mounts.cc	2008-03-20 22:05:09.000000000 +0300
@@ -11,6 +11,8 @@
 #include <iostream>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
diff -urN lshw-B.02.12.01-orig/src/core/osutils.cc lshw-B.02.12.01/src/core/osutils.cc
--- lshw-B.02.12.01-orig/src/core/osutils.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/osutils.cc	2008-03-20 22:05:30.000000000 +0300
@@ -9,6 +9,7 @@
 #include <dirent.h>
 #include <limits.h>
 #include <stdlib.h>
+#include <string.h>
 #include <regex.h>
 #include <ctype.h>
 #include <stdio.h>
diff -urN lshw-B.02.12.01-orig/src/core/parisc.cc lshw-B.02.12.01/src/core/parisc.cc
--- lshw-B.02.12.01-orig/src/core/parisc.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/parisc.cc	2008-03-20 22:05:59.000000000 +0300
@@ -17,6 +17,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <dirent.h>
 
diff -urN lshw-B.02.12.01-orig/src/core/partitions.cc lshw-B.02.12.01/src/core/partitions.cc
--- lshw-B.02.12.01-orig/src/core/partitions.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/partitions.cc	2008-03-20 22:06:36.000000000 +0300
@@ -24,6 +24,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <string.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <stdint.h>
 
diff -urN lshw-B.02.12.01-orig/src/core/pci.cc lshw-B.02.12.01/src/core/pci.cc
--- lshw-B.02.12.01-orig/src/core/pci.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/pci.cc	2008-03-20 22:07:04.000000000 +0300
@@ -6,6 +6,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 #include <dirent.h>
 
 __ID("@(#) $Id: pci.cc 1907 2007-10-13 22:23:16Z lyonel $");
diff -urN lshw-B.02.12.01-orig/src/core/pcmcia.cc lshw-B.02.12.01/src/core/pcmcia.cc
--- lshw-B.02.12.01-orig/src/core/pcmcia.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/pcmcia.cc	2008-03-20 22:07:24.000000000 +0300
@@ -7,6 +7,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <dirent.h>
 
diff -urN lshw-B.02.12.01-orig/src/core/pcmcia-legacy.cc lshw-B.02.12.01/src/core/pcmcia-legacy.cc
--- lshw-B.02.12.01-orig/src/core/pcmcia-legacy.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/pcmcia-legacy.cc	2008-03-20 22:07:43.000000000 +0300
@@ -7,6 +7,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <string.h>
 #include <errno.h>
 
 __ID("@(#) $Id: pcmcia-legacy.cc 1907 2007-10-13 22:23:16Z lyonel $");
diff -urN lshw-B.02.12.01-orig/src/core/pnp.cc lshw-B.02.12.01/src/core/pnp.cc
--- lshw-B.02.12.01-orig/src/core/pnp.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/pnp.cc	2008-03-20 22:08:03.000000000 +0300
@@ -9,6 +9,7 @@
 #include "version.h"
 #include "pnp.h"
 
+#include <stdlib.h>
 #include <string.h>
 
 __ID("@(#) $Id: pnp.cc 1907 2007-10-13 22:23:16Z lyonel $");
diff -urN lshw-B.02.12.01-orig/src/core/print.cc lshw-B.02.12.01/src/core/print.cc
--- lshw-B.02.12.01-orig/src/core/print.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/print.cc	2008-03-20 22:08:44.000000000 +0300
@@ -11,10 +11,12 @@
 #include "options.h"
 #include "version.h"
 #include "osutils.h"
+#include <cstring>
 #include <iostream>
 #include <sstream>
 #include <iomanip>
 #include <unistd.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <termios.h>
diff -urN lshw-B.02.12.01-orig/src/core/scsi.cc lshw-B.02.12.01/src/core/scsi.cc
--- lshw-B.02.12.01-orig/src/core/scsi.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/scsi.cc	2008-03-20 22:09:10.000000000 +0300
@@ -12,6 +12,8 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <scsi/sg.h>
 #include <scsi/scsi.h>
 #ifndef MKDEV
diff -urN lshw-B.02.12.01-orig/src/core/smp.cc lshw-B.02.12.01/src/core/smp.cc
--- lshw-B.02.12.01-orig/src/core/smp.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/smp.cc	2008-03-20 22:09:36.000000000 +0300
@@ -9,6 +9,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "osutils.h"
diff -urN lshw-B.02.12.01-orig/src/core/spd.cc lshw-B.02.12.01/src/core/spd.cc
--- lshw-B.02.12.01-orig/src/core/spd.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/spd.cc	2008-03-20 22:09:57.000000000 +0300
@@ -5,6 +5,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <string.h>
 #include <string>
 #include <dirent.h>
 #include <stdio.h>
diff -urN lshw-B.02.12.01-orig/src/core/sysfs.cc lshw-B.02.12.01/src/core/sysfs.cc
--- lshw-B.02.12.01-orig/src/core/sysfs.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/sysfs.cc	2008-03-20 22:10:14.000000000 +0300
@@ -11,6 +11,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <dirent.h>
 #include <libgen.h>
 #include <sys/stat.h>
diff -urN lshw-B.02.12.01-orig/src/core/usb.cc lshw-B.02.12.01/src/core/usb.cc
--- lshw-B.02.12.01-orig/src/core/usb.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/usb.cc	2008-03-20 22:10:45.000000000 +0300
@@ -18,6 +18,8 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <string.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <dirent.h>
 
diff -urN lshw-B.02.12.01-orig/src/core/volumes.cc lshw-B.02.12.01/src/core/volumes.cc
--- lshw-B.02.12.01-orig/src/core/volumes.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/core/volumes.cc	2008-03-20 22:11:04.000000000 +0300
@@ -15,6 +15,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <string.h>
 #include <unistd.h>
 #include <stdint.h>
 #include <time.h>
diff -urN lshw-B.02.12.01-orig/src/gui/engine.cc lshw-B.02.12.01/src/gui/engine.cc
--- lshw-B.02.12.01-orig/src/gui/engine.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/gui/engine.cc	2008-03-20 22:11:36.000000000 +0300
@@ -9,6 +9,8 @@
 #include <iostream>
 #include <fstream>
 #include <sys/utsname.h>
+#include <stdlib.h>
+#include <string.h>
 #include <libgen.h>
 
 static char *id = "@(#) $Id: engine.cc 1907 2007-10-13 22:23:16Z lyonel $";
diff -urN lshw-B.02.12.01-orig/src/lshw.cc lshw-B.02.12.01/src/lshw.cc
--- lshw-B.02.12.01-orig/src/lshw.cc	2008-03-20 21:59:30.000000000 +0300
+++ lshw-B.02.12.01/src/lshw.cc	2008-03-20 22:12:04.000000000 +0300
@@ -8,6 +8,8 @@
 
 #include <unistd.h>
 #include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 #include <iostream>
 
 __ID("@(#) $Id: lshw.cc 1907 2007-10-13 22:23:16Z lyonel $");