--- src/libfreebobavc/avc_generic.cpp~	2008-02-28 08:43:13.000000000 -0500
+++ src/libfreebobavc/avc_generic.cpp	2008-02-28 08:43:59.000000000 -0500
@@ -24,6 +24,7 @@
 
 #include <cstdlib>
 #include <netinet/in.h>
+#include <cstring>
 
 #define DEBUG_EXTRA_VERBOSE 2
 
--- tests/test-extplugcmd.cpp~	2007-08-21 14:11:09.000000000 -0700
+++ tests/test-extplugcmd.cpp	2008-02-28 08:04:11.000000000 -0800
@@ -24,6 +24,7 @@
 #include "libfreebobavc/ieee1394service.h"
 
 #include <argp.h>
+#include <cstdlib>
 
 using namespace std;
 
--- src/libfreebobavc/avc_extended_plug_info.cpp~	2007-08-21 14:11:10.000000000 -0700
+++ src/libfreebobavc/avc_extended_plug_info.cpp	2008-02-28 08:21:52.000000000 -0800
@@ -23,6 +23,7 @@
 #include "ieee1394service.h"
 
 #include <cstdlib>
+#include <cstring>
 #include <netinet/in.h>
 #include <iostream>
 
--- tests/test-volume.cpp~	2007-08-21 14:26:07.000000000 -0700
+++ tests/test-volume.cpp	2008-02-28 08:31:31.000000000 -0800
@@ -22,6 +22,8 @@
 #include "libfreebobavc/serialize.h"
 #include "libfreebobavc/ieee1394service.h"
 
+#include <cstdlib>
+
 const bool bVerbose = false;
 
 short int