--- barry-0.12/src/data.cc.orig	2008-06-03 08:46:17.000000000 +0800
+++ barry-0.12/src/data.cc	2008-06-03 08:45:57.000000000 +0800
@@ -25,6 +25,8 @@
 #include <iomanip>
 #include <string>
 #include <stdexcept>
+#include <string.h>
+#include <stdlib.h>
 
 //#define __DEBUG_MODE__
 #include "debug.h"
--- barry-0.12/src/ldif.cc.orig	2008-06-03 08:50:09.000000000 +0800
+++ barry-0.12/src/ldif.cc	2008-06-03 08:50:19.000000000 +0800
@@ -25,6 +25,7 @@
 #include <stdexcept>
 #include <iostream>
 #include <iomanip>
+#include <string.h>
 
 #define __DEBUG_MODE__
 #include "debug.h"
--- barry-0.12/src/socket.cc.orig	2008-06-03 08:52:21.000000000 +0800
+++ barry-0.12/src/socket.cc	2008-06-03 08:52:30.000000000 +0800
@@ -30,7 +30,7 @@
 #include "endian.h"
 #include <openssl/sha.h>
 #include <sstream>
-
+#include <string.h>
 
 using namespace Usb;
 
--- barry-0.12/src/record.cc.orig	2008-06-03 08:55:00.000000000 +0800
+++ barry-0.12/src/record.cc	2008-06-03 08:55:16.000000000 +0800
@@ -36,6 +36,7 @@
 #include <iomanip>
 #include <time.h>
 #include <stdexcept>
+#include <string.h>
 
 #define __DEBUG_MODE__
 #include "debug.h"
--- barry-0.12/src/r_calendar.cc.orig	2008-06-03 08:56:59.000000000 +0800
+++ barry-0.12/src/r_calendar.cc	2008-06-03 08:57:13.000000000 +0800
@@ -31,6 +31,7 @@
 #include <iomanip>
 #include <time.h>
 #include <stdexcept>
+#include <string.h>
 
 #define __DEBUG_MODE__
 #include "debug.h"
--- barry-0.12/src/r_task.cc.orig	2008-06-03 08:59:05.000000000 +0800
+++ barry-0.12/src/r_task.cc	2008-06-03 08:59:16.000000000 +0800
@@ -28,6 +28,7 @@
 #include "debug.h"
 #include <ostream>
 #include <iomanip>
+#include <string.h>
 
 using namespace std;
 using namespace Barry::Protocol;
--- barry-0.12/src/packet.cc.orig	2008-06-03 09:01:27.000000000 +0800
+++ barry-0.12/src/packet.cc	2008-06-03 09:01:39.000000000 +0800
@@ -30,6 +30,7 @@
 #include "parser.h"
 #include "builder.h"
 #include "error.h"
+#include <string.h>
 
 #define __DEBUG_MODE__
 #include "debug.h"
--- barry-0.12/src/controller.cc.orig	2008-06-03 09:02:20.000000000 +0800
+++ barry-0.12/src/controller.cc	2008-06-03 09:02:29.000000000 +0800
@@ -29,6 +29,7 @@
 #include "builder.h"
 #include "endian.h"
 #include "packet.h"
+#include <string.h>
 
 #define __DEBUG_MODE__
 #include "debug.h"
--- barry-0.12/tools/btool.cc.orig	2008-06-03 09:05:26.000000000 +0800
+++ barry-0.12/tools/btool.cc	2008-06-03 09:46:07.000000000 +0800
@@ -27,7 +27,8 @@
 #include <vector>
 #include <string>
 #include <getopt.h>
-
+#include <algorithm>
+#include <string.h>
 
 using namespace std;
 using namespace Barry;
--- barry-0.12/tools/bs11nread.cc.orig	2008-06-03 09:50:14.000000000 +0800
+++ barry-0.12/tools/bs11nread.cc	2008-06-03 09:50:45.000000000 +0800
@@ -28,7 +28,7 @@
 #include <vector>
 #include <string>
 #include <getopt.h>
-
+#include <algorithm>
 
 using namespace std;
 using namespace Barry;
--- barry-0.12/tools/btranslate.cc.orig	2008-06-03 09:47:40.000000000 +0800
+++ barry-0.12/tools/btranslate.cc	2008-06-03 09:49:35.000000000 +0800
@@ -17,6 +17,9 @@
 #include <iostream>
 #include <iomanip>
 #include <sstream>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
 
 using namespace std;
 
--- barry-0.12/examples/addcalendar.cc.orig	2008-06-03 09:54:20.000000000 +0800
+++ barry-0.12/examples/addcalendar.cc	2008-06-03 09:54:50.000000000 +0800
@@ -24,6 +24,7 @@
 #include <time.h>
 #include <barry/barry.h>
 #include <iostream>
+#include <string.h>
 
 using namespace std;
 using namespace Barry;