diff -ur libsmbios-0.13.6.orig/bin-supported/assetTag.cpp libsmbios-0.13.6/bin-supported/assetTag.cpp
--- libsmbios-0.13.6.orig/bin-supported/assetTag.cpp	2007-02-08 19:20:48.000000000 +0000
+++ libsmbios-0.13.6/bin-supported/assetTag.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <iomanip>
 #include <stdlib.h>
+#include <cstring>
 
 #include "smbios/IMemory.h"  // only needed if you want to use fake input (memdump.dat)
 #include "smbios/ICmosRW.h"  // only needed if you want to use fake input (cmos.dat)
diff -ur libsmbios-0.13.6.orig/bin-supported/dellBiosUpdate.cpp libsmbios-0.13.6/bin-supported/dellBiosUpdate.cpp
--- libsmbios-0.13.6.orig/bin-supported/dellBiosUpdate.cpp	2007-04-20 23:31:25.000000000 +0000
+++ libsmbios-0.13.6/bin-supported/dellBiosUpdate.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -20,6 +20,7 @@
 #include "smbios/compat.h"
 
 #include <iostream>
+#include <cstring>
 
 #include "smbios/DellRbu.h"
 #include "smbios/SystemInfo.h"
diff -ur libsmbios-0.13.6.orig/bin-supported/dellLcdBrightness.cpp libsmbios-0.13.6/bin-supported/dellLcdBrightness.cpp
--- libsmbios-0.13.6.orig/bin-supported/dellLcdBrightness.cpp	2007-02-08 19:20:49.000000000 +0000
+++ libsmbios-0.13.6/bin-supported/dellLcdBrightness.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -22,6 +22,7 @@
 #include <string>
 #include <iostream>
 #include <iomanip>
+#include <cstring>
 #include <stdlib.h>
 
 #include "smbios/ISmi.h"
diff -ur libsmbios-0.13.6.orig/bin-supported/dellWirelessCtl.cpp libsmbios-0.13.6/bin-supported/dellWirelessCtl.cpp
--- libsmbios-0.13.6.orig/bin-supported/dellWirelessCtl.cpp	2007-03-13 13:58:28.000000000 +0000
+++ libsmbios-0.13.6/bin-supported/dellWirelessCtl.cpp	2008-06-21 22:23:16.726900939 +0000
@@ -22,6 +22,7 @@
 #include <string>
 #include <iostream>
 #include <iomanip>
+#include <cstring>
 #include <stdlib.h>
 
 #include "smbios/ISmi.h"
diff -ur libsmbios-0.13.6.orig/bin-supported/propertyTag.cpp libsmbios-0.13.6/bin-supported/propertyTag.cpp
--- libsmbios-0.13.6.orig/bin-supported/propertyTag.cpp	2007-02-08 19:20:49.000000000 +0000
+++ libsmbios-0.13.6/bin-supported/propertyTag.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <iomanip>
 #include <stdlib.h>
+#include <cstring>
 
 #include "smbios/ISmi.h"  // only needed if you want to use fake input (memdump.dat)
 #include "smbios/SystemInfo.h" // this is the main header to include to use the C interface
diff -ur libsmbios-0.13.6.orig/bin-supported/serviceTag.cpp libsmbios-0.13.6/bin-supported/serviceTag.cpp
--- libsmbios-0.13.6.orig/bin-supported/serviceTag.cpp	2007-02-08 19:20:49.000000000 +0000
+++ libsmbios-0.13.6/bin-supported/serviceTag.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <iomanip>
 #include <stdlib.h>
+#include <cstring>
 
 #include "smbios/IMemory.h"  // only needed if you want to use fake input (memdump.dat)
 #include "smbios/ICmosRW.h"  // only needed if you want to use fake input (cmos.dat)
diff -ur libsmbios-0.13.6.orig/bin-supported/tokenCtl.cpp libsmbios-0.13.6/bin-supported/tokenCtl.cpp
--- libsmbios-0.13.6.orig/bin-supported/tokenCtl.cpp	2007-02-08 19:20:49.000000000 +0000
+++ libsmbios-0.13.6/bin-supported/tokenCtl.cpp	2008-06-21 22:22:44.583573424 +0000
@@ -35,6 +35,7 @@
 #include <string>
 #include <iostream>
 #include <iomanip>
+#include <cstring>
 #include <stdlib.h>
 
 #include "smbios/IToken.h"
diff -ur libsmbios-0.13.6.orig/bin-supported/verifySmiPassword.cpp libsmbios-0.13.6/bin-supported/verifySmiPassword.cpp
--- libsmbios-0.13.6.orig/bin-supported/verifySmiPassword.cpp	2007-02-08 19:20:49.000000000 +0000
+++ libsmbios-0.13.6/bin-supported/verifySmiPassword.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -20,6 +20,7 @@
 #include "smbios/compat.h"
 
 #include <iostream>
+#include <cstring>
 
 #include "smbios/ISmi.h"
 #include "smbios/SystemInfo.h"
diff -ur libsmbios-0.13.6.orig/bin-unsupported/ascii2enUS_scancode.cpp libsmbios-0.13.6/bin-unsupported/ascii2enUS_scancode.cpp
--- libsmbios-0.13.6.orig/bin-unsupported/ascii2enUS_scancode.cpp	2007-02-08 19:20:23.000000000 +0000
+++ libsmbios-0.13.6/bin-unsupported/ascii2enUS_scancode.cpp	2008-06-21 22:26:54.936879454 +0000
@@ -20,6 +20,7 @@
 #include "smbios/compat.h"
 
 #include <iostream>
+#include <cstring>
 
 #include "smbios/ISmi.h"
 #include "smbios/version.h"
diff -ur libsmbios-0.13.6.orig/bin-unsupported/dellLEDCtl.cpp libsmbios-0.13.6/bin-unsupported/dellLEDCtl.cpp
--- libsmbios-0.13.6.orig/bin-unsupported/dellLEDCtl.cpp	2007-03-14 05:33:57.000000000 +0000
+++ libsmbios-0.13.6/bin-unsupported/dellLEDCtl.cpp	2008-06-21 22:25:29.316888077 +0000
@@ -23,6 +23,7 @@
 #include <string>
 #include <iostream>
 #include <iomanip>
+#include <cstring>
 #include <stdlib.h>
 #include <ctype.h>
 //#define SHOW_STROBE_PERF
diff -ur libsmbios-0.13.6.orig/bin-unsupported/smitest.cpp libsmbios-0.13.6/bin-unsupported/smitest.cpp
--- libsmbios-0.13.6.orig/bin-unsupported/smitest.cpp	2007-02-08 19:20:24.000000000 +0000
+++ libsmbios-0.13.6/bin-unsupported/smitest.cpp	2008-06-21 22:24:27.613560176 +0000
@@ -22,6 +22,7 @@
 #include <string>
 #include <iostream>
 #include <iomanip>
+#include <cstring>
 #include <stdlib.h>
 
 #include "smbios/ISmi.h"  // only needed if you want to use fake input (memdump.dat)
diff -ur libsmbios-0.13.6.orig/include/smbios/ISmi.h libsmbios-0.13.6/include/smbios/ISmi.h
--- libsmbios-0.13.6.orig/include/smbios/ISmi.h	2007-03-13 13:50:57.000000000 +0000
+++ libsmbios-0.13.6/include/smbios/ISmi.h	2008-06-21 21:56:35.633726542 +0000
@@ -23,6 +23,7 @@
 #include "smbios/compat.h"
 
 #include <iostream>
+#include <memory>
 
 // types.h should be first user-defined header.
 #include "smbios/types.h"
@@ -55,7 +56,7 @@
     class SmiFactory : public virtual factory::IFactory
     {
     public:
-        enum { RAW_SMI, DELL_CALLING_INTERFACE_SMI_RAW, DELL_CALLING_INTERFACE_SMI,};
+        enum { RAW_SMI, DELL_CALLING_INTERFACE_SMI_RAW, DELL_CALLING_INTERFACE_SMI };
     
         static SmiFactory *getFactory();
         virtual ~SmiFactory() throw();
diff -ur libsmbios-0.13.6.orig/libraries/common/SmbiosImpl.h libsmbios-0.13.6/libraries/common/SmbiosImpl.h
--- libsmbios-0.13.6.orig/libraries/common/SmbiosImpl.h	2007-03-01 18:49:19.000000000 +0000
+++ libsmbios-0.13.6/libraries/common/SmbiosImpl.h	2008-06-21 21:49:39.000000000 +0000
@@ -23,6 +23,7 @@
 #include "smbios/compat.h"
 
 #include <vector>
+#include <memory>
 
 #include "smbios/ISmbios.h"
 #include "smbios/SmbiosLowLevel.h"
diff -ur libsmbios-0.13.6.orig/libraries/common/TokenImpl.h libsmbios-0.13.6/libraries/common/TokenImpl.h
--- libsmbios-0.13.6.orig/libraries/common/TokenImpl.h	2007-02-08 19:20:47.000000000 +0000
+++ libsmbios-0.13.6/libraries/common/TokenImpl.h	2008-06-21 21:49:39.000000000 +0000
@@ -22,6 +22,7 @@
 #include "smbios/compat.h"
 
 #include <vector>
+#include <memory>
 
 // types.h should be first user-defined header.
 #include "smbios/types.h"
@@ -246,7 +247,7 @@
         CHECK_TYPE_WORD_CHECKSUM   = 0x00, //simple running sum in word
         CHECK_TYPE_BYTE_CHECKSUM   = 0x01, //simple running sum in byte
         CHECK_TYPE_WORD_CRC        = 0x02, // crc
-        CHECK_TYPE_WORD_CHECKSUM_N = 0x03, //simple runnign sum in word, then (~result + 1)
+        CHECK_TYPE_WORD_CHECKSUM_N = 0x03  //simple runnign sum in word, then (~result + 1)
     };
 
 
diff -ur libsmbios-0.13.6.orig/libraries/common/TokenLowLevel.h libsmbios-0.13.6/libraries/common/TokenLowLevel.h
--- libsmbios-0.13.6.orig/libraries/common/TokenLowLevel.h	2007-02-08 19:20:42.000000000 +0000
+++ libsmbios-0.13.6/libraries/common/TokenLowLevel.h	2008-06-21 21:49:39.000000000 +0000
@@ -37,12 +37,12 @@
         DellIndexedIoTokenType = 0xD4,
         DellProtectedAreaType1 = 0xD5,
         DellProtectedAreaType2 = 0xD6,
-        DellCallingInterface   = 0xDA,
+        DellCallingInterface   = 0xDA
     };
 
     enum // Token types
     {
-        TokenTypeEOT = 0xffff,
+        TokenTypeEOT = 0xffff
     };
 
     struct indexed_io_token
@@ -147,7 +147,7 @@
         pvFmtAlphaNumericScanCode = 0,
         pvFmtAlphaNumericAscii    = 1,
         pvFmtAlphaNumericScanCodeNS = 2,
-        pvFmtAlphaNumericAsciiNS   = 3,
+        pvFmtAlphaNumericAsciiNS   = 3
     };
 
 
diff -ur libsmbios-0.13.6.orig/libraries/memory/Memory.cpp libsmbios-0.13.6/libraries/memory/Memory.cpp
--- libsmbios-0.13.6.orig/libraries/memory/Memory.cpp	2007-02-08 19:20:42.000000000 +0000
+++ libsmbios-0.13.6/libraries/memory/Memory.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -22,6 +22,7 @@
 
 #include <errno.h>
 #include <stdio.h>
+#include <cstring>
 
 #include "MemoryImpl.h"
 
diff -ur libsmbios-0.13.6.orig/libraries/memory/Memory_Linux.cpp libsmbios-0.13.6/libraries/memory/Memory_Linux.cpp
--- libsmbios-0.13.6.orig/libraries/memory/Memory_Linux.cpp	2007-02-08 19:20:42.000000000 +0000
+++ libsmbios-0.13.6/libraries/memory/Memory_Linux.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <sys/mman.h>   /* mmap */
 #include <unistd.h>     /* getpagesize */
+#include <cstring>      /* strerror */
 
 #include "MemoryImpl.h"
 
diff -ur libsmbios-0.13.6.orig/libraries/smbios/SmbiosItem.cpp libsmbios-0.13.6/libraries/smbios/SmbiosItem.cpp
--- libsmbios-0.13.6.orig/libraries/smbios/SmbiosItem.cpp	2007-02-08 19:20:43.000000000 +0000
+++ libsmbios-0.13.6/libraries/smbios/SmbiosItem.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -21,6 +21,8 @@
 #include "smbios/compat.h"
 
 #include <iomanip>
+#include <memory>
+#include <cstring>
 
 #include "SmbiosImpl.h"
 // message.h should be included last.
diff -ur libsmbios-0.13.6.orig/libraries/smbios/SmbiosStrategy.cpp libsmbios-0.13.6/libraries/smbios/SmbiosStrategy.cpp
--- libsmbios-0.13.6.orig/libraries/smbios/SmbiosStrategy.cpp	2007-04-19 21:52:04.000000000 +0000
+++ libsmbios-0.13.6/libraries/smbios/SmbiosStrategy.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -22,6 +22,8 @@
 
 #include <sstream>
 
+#include <cstring>
+
 #include "smbios/IMemory.h"
 #include "SmbiosImpl.h"
 
diff -ur libsmbios-0.13.6.orig/libraries/smbios/SmbiosStrategy_Linux.cpp libsmbios-0.13.6/libraries/smbios/SmbiosStrategy_Linux.cpp
--- libsmbios-0.13.6.orig/libraries/smbios/SmbiosStrategy_Linux.cpp	2007-03-01 23:00:57.000000000 +0000
+++ libsmbios-0.13.6/libraries/smbios/SmbiosStrategy_Linux.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -21,6 +21,7 @@
 #include "smbios/compat.h"
 
 #include <sstream>
+#include <cstring>
 
 #include "smbios/IMemory.h"
 #include "SmbiosImpl.h"
diff -ur libsmbios-0.13.6.orig/libraries/smbios/SmbiosTable.cpp libsmbios-0.13.6/libraries/smbios/SmbiosTable.cpp
--- libsmbios-0.13.6.orig/libraries/smbios/SmbiosTable.cpp	2007-04-19 17:43:11.000000000 +0000
+++ libsmbios-0.13.6/libraries/smbios/SmbiosTable.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -21,6 +21,8 @@
 #include "smbios/compat.h"
 
 #include <sstream>
+#include <memory>
+#include <cstring>
 
 #include "SmbiosImpl.h"
 
diff -ur libsmbios-0.13.6.orig/libraries/smbios/SmbiosWorkaround.cpp libsmbios-0.13.6/libraries/smbios/SmbiosWorkaround.cpp
--- libsmbios-0.13.6.orig/libraries/smbios/SmbiosWorkaround.cpp	2007-02-08 19:20:44.000000000 +0000
+++ libsmbios-0.13.6/libraries/smbios/SmbiosWorkaround.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -23,6 +23,8 @@
 
 #include "StdWorkarounds.h"
 
+#include <cstring>
+
 // message.h should be included last.
 #include "smbios/message.h"
 
diff -ur libsmbios-0.13.6.orig/libraries/smi/Smi.cpp libsmbios-0.13.6/libraries/smi/Smi.cpp
--- libsmbios-0.13.6.orig/libraries/smi/Smi.cpp	2007-03-13 13:46:03.000000000 +0000
+++ libsmbios-0.13.6/libraries/smi/Smi.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -21,6 +21,8 @@
 #include "smbios/compat.h"
 
 //#include <iostream>
+#include <memory>
+#include <cstring>
 
 #include "SmiImpl.h"
 #include "smbios/ISmbios.h"
diff -ur libsmbios-0.13.6.orig/libraries/smi/SmiFactory.cpp libsmbios-0.13.6/libraries/smi/SmiFactory.cpp
--- libsmbios-0.13.6.orig/libraries/smi/SmiFactory.cpp	2007-03-07 23:16:32.000000000 +0000
+++ libsmbios-0.13.6/libraries/smi/SmiFactory.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -21,6 +21,8 @@
 #include "FactoryImpl2.h"
 #include "TokenImpl.h"
 
+#include <memory>
+
 // message.h should be included last.
 #include "smbios/message.h"
 
diff -ur libsmbios-0.13.6.orig/libraries/smi/SmiImpl.h libsmbios-0.13.6/libraries/smi/SmiImpl.h
--- libsmbios-0.13.6.orig/libraries/smi/SmiImpl.h	2007-03-09 20:46:43.000000000 +0000
+++ libsmbios-0.13.6/libraries/smi/SmiImpl.h	2008-06-21 21:49:39.000000000 +0000
@@ -18,6 +18,8 @@
 #ifndef SMIIMPL_H
 #define SMIIMPL_H
 
+#include <memory>
+
 #include "smbios/ISmi.h"
 #include "SmiLowLevel.h"
 #include "ExceptionImpl.h"
diff -ur libsmbios-0.13.6.orig/libraries/smi/SmiLowLevel.h libsmbios-0.13.6/libraries/smi/SmiLowLevel.h
--- libsmbios-0.13.6.orig/libraries/smi/SmiLowLevel.h	2007-02-08 19:20:45.000000000 +0000
+++ libsmbios-0.13.6/libraries/smi/SmiLowLevel.h	2008-06-21 22:17:07.883616976 +0000
@@ -81,7 +81,7 @@
     enum
     {
         class_user_password =  9,
-        class_admin_password = 10,
+        class_admin_password = 10
     };
 
 
diff -ur libsmbios-0.13.6.orig/libraries/smi/Smi_Linux.cpp libsmbios-0.13.6/libraries/smi/Smi_Linux.cpp
--- libsmbios-0.13.6.orig/libraries/smi/Smi_Linux.cpp	2007-02-08 19:20:46.000000000 +0000
+++ libsmbios-0.13.6/libraries/smi/Smi_Linux.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -21,6 +21,7 @@
 #include "smbios/compat.h"
 
 #include <sys/file.h>
+#include <cstring>
 
 #include "SmiImpl.h"
 
diff -ur libsmbios-0.13.6.orig/libraries/systeminfo/IdByte.cpp libsmbios-0.13.6/libraries/systeminfo/IdByte.cpp
--- libsmbios-0.13.6.orig/libraries/systeminfo/IdByte.cpp	2007-02-08 19:20:46.000000000 +0000
+++ libsmbios-0.13.6/libraries/systeminfo/IdByte.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -28,6 +28,8 @@
 #include "SystemDetect.h"
 #include "DellMagic.h"
 
+#include <cstring>
+
 // should always be included last.
 #include "smbios/message.h"
 
diff -ur libsmbios-0.13.6.orig/libraries/systeminfo/System.cpp libsmbios-0.13.6/libraries/systeminfo/System.cpp
--- libsmbios-0.13.6.orig/libraries/systeminfo/System.cpp	2007-02-08 19:20:46.000000000 +0000
+++ libsmbios-0.13.6/libraries/systeminfo/System.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -31,6 +31,8 @@
 
 #include "smbios/version.h"
 
+#include <cstring>
+
 // this always should be included last
 #include "smbios/message.h"
 
diff -ur libsmbios-0.13.6.orig/libraries/systeminfo/SystemDetect.cpp libsmbios-0.13.6/libraries/systeminfo/SystemDetect.cpp
--- libsmbios-0.13.6.orig/libraries/systeminfo/SystemDetect.cpp	2007-02-08 19:20:46.000000000 +0000
+++ libsmbios-0.13.6/libraries/systeminfo/SystemDetect.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -30,6 +30,8 @@
 // all our magic numbers
 #include "DellMagic.h"
 
+#include <cstring>
+
 // include this last.
 #include "smbios/message.h"
 
diff -ur libsmbios-0.13.6.orig/libraries/token/TokenD4.cpp libsmbios-0.13.6/libraries/token/TokenD4.cpp
--- libsmbios-0.13.6.orig/libraries/token/TokenD4.cpp	2007-02-08 19:20:46.000000000 +0000
+++ libsmbios-0.13.6/libraries/token/TokenD4.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -21,6 +21,7 @@
 #include "smbios/compat.h"
 
 #include <iomanip>
+#include <cstring>
 
 #include "TokenImpl.h"
 
diff -ur libsmbios-0.13.6.orig/libraries/token/TokenD5.cpp libsmbios-0.13.6/libraries/token/TokenD5.cpp
--- libsmbios-0.13.6.orig/libraries/token/TokenD5.cpp	2007-02-08 19:20:47.000000000 +0000
+++ libsmbios-0.13.6/libraries/token/TokenD5.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -22,6 +22,7 @@
 
 #include <sstream>
 #include <iomanip>
+#include <cstring>
 
 #include "TokenImpl.h"
 
diff -ur libsmbios-0.13.6.orig/libraries/token/TokenD6.cpp libsmbios-0.13.6/libraries/token/TokenD6.cpp
--- libsmbios-0.13.6.orig/libraries/token/TokenD6.cpp	2007-02-08 19:20:47.000000000 +0000
+++ libsmbios-0.13.6/libraries/token/TokenD6.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -22,6 +22,7 @@
 
 #include <sstream>
 #include <iomanip>
+#include <cstring>
 
 #include "TokenImpl.h"
 
diff -ur libsmbios-0.13.6.orig/libraries/token/TokenDA.cpp libsmbios-0.13.6/libraries/token/TokenDA.cpp
--- libsmbios-0.13.6.orig/libraries/token/TokenDA.cpp	2007-03-09 17:54:26.000000000 +0000
+++ libsmbios-0.13.6/libraries/token/TokenDA.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -21,6 +21,8 @@
 #include "smbios/compat.h"
 
 #include <iomanip>
+#include <memory>
+#include <cstring>
 
 #include "TokenImpl.h"
 
diff -ur libsmbios-0.13.6.orig/libraries/xml_libxml2/SmbiosXml.cpp libsmbios-0.13.6/libraries/xml_libxml2/SmbiosXml.cpp
--- libsmbios-0.13.6.orig/libraries/xml_libxml2/SmbiosXml.cpp	2007-04-19 17:55:36.000000000 +0000
+++ libsmbios-0.13.6/libraries/xml_libxml2/SmbiosXml.cpp	2008-06-21 21:49:39.000000000 +0000
@@ -22,6 +22,7 @@
 
 #include <sstream>
 #include <iomanip>
+#include <cstring>
 
 #include "SmbiosXmlImpl.h"
 #include "StdSmbiosXml.h"