--- cyphesis-0.5.15/tools/cyconvertrules.cpp.orig	2008-02-21 16:11:18.000000000 -0800
+++ cyphesis-0.5.15/tools/cyconvertrules.cpp	2008-02-21 16:11:27.000000000 -0800
@@ -35,6 +35,7 @@
 #include <string>
 #include <fstream>
 #include <iostream>
+#include <cstring>
 
 using Atlas::Message::Element;
 using Atlas::Message::MapType;
--- cyphesis-0.5.15/tools/cyconfig.cpp.orig	2008-02-21 16:10:54.000000000 -0800
+++ cyphesis-0.5.15/tools/cyconfig.cpp	2008-02-21 16:11:06.000000000 -0800
@@ -34,6 +34,8 @@
 #include <varconf/config.h>
 
 #include <cassert>
+#include <cstring>
+#include <cstdlib>
 
 static int install(int argc, char ** argv)
 {
--- cyphesis-0.5.15/tools/cycmd.cpp.orig	2008-02-21 16:07:53.000000000 -0800
+++ cyphesis-0.5.15/tools/cycmd.cpp	2008-02-21 16:08:10.000000000 -0800
@@ -70,6 +70,8 @@
 
 #include <iostream>
 #include <algorithm>
+#include <cstring>
+#include <cstdlib>
 
 #include <cstdio>
 
--- cyphesis-0.5.15/modules/DateTime.cpp.orig	2008-02-10 17:10:55.000000000 -0800
+++ cyphesis-0.5.15/modules/DateTime.cpp	2008-02-10 17:11:09.000000000 -0800
@@ -20,6 +20,7 @@
 #include "DateTime.h"
 
 #include <stdio.h>
+#include <cstdlib>
 
 // date_pat=re.compile("^|[-:]|\s+");
 
--- cyphesis-0.5.15/server/CommServer.cpp.orig	2008-02-21 16:04:17.000000000 -0800
+++ cyphesis-0.5.15/server/CommServer.cpp	2008-02-21 16:04:26.000000000 -0800
@@ -36,6 +36,7 @@
 #include <skstream/sksocket.h>
 
 #include <iostream>
+#include <cstring>
 
 extern "C" {
 #ifdef HAVE_EPOLL_CREATE
--- cyphesis-0.5.15/server/CommListener.cpp.orig	2008-02-21 15:59:46.000000000 -0800
+++ cyphesis-0.5.15/server/CommListener.cpp	2008-02-21 16:00:07.000000000 -0800
@@ -43,6 +43,7 @@
 #include <errno.h>
 
 #include <cassert>
+#include <cstring>
 
 static const bool debug_flag = false;
 
--- cyphesis-0.5.15/tests/Containertest.cpp.orig	2008-02-21 16:16:12.000000000 -0800
+++ cyphesis-0.5.15/tests/Containertest.cpp	2008-02-21 16:16:19.000000000 -0800
@@ -22,6 +22,7 @@
 #include <iostream>
 
 #include <cassert>
+#include <cstdlib>
 
 int main()
 {
--- cyphesis-0.5.15/tests/PropertyExerciser.cpp.orig	2008-02-21 16:39:03.000000000 -0800
+++ cyphesis-0.5.15/tests/PropertyExerciser.cpp	2008-02-21 16:39:09.000000000 -0800
@@ -26,6 +26,7 @@
 #include <Atlas/Objects/Anonymous.h>
 
 #include <limits>
+#include <limits.h>
 
 #include <cassert>
 
--- cyphesis-0.5.15/common/Database.cpp.orig	2008-02-10 16:11:37.000000000 -0800
+++ cyphesis-0.5.15/common/Database.cpp	2008-02-10 16:22:51.000000000 -0800
@@ -33,6 +33,8 @@
 
 #include <iostream>
 #include <sstream>
+#include <cstdlib>
+#include <cstring>
 
 #include <cassert>
 
--- cyphesis-0.5.15/common/log.cpp.orig	2008-02-10 16:12:42.000000000 -0800
+++ cyphesis-0.5.15/common/log.cpp	2008-02-10 16:12:56.000000000 -0800
@@ -27,6 +27,7 @@
 
 #include <iostream>
 #include <fstream>
+#include <cstring>
 
 extern "C" {
 #ifdef HAVE_SYSLOG_H
--- cyphesis-0.5.15/common/types.h.orig	2008-02-10 16:57:06.000000000 -0800
+++ cyphesis-0.5.15/common/types.h	2008-02-10 16:41:16.000000000 -0800
@@ -25,6 +25,7 @@
 #include <set>
 #include <map>
 #include <vector>
+#include <string>
 
 class BaseEntity;
 class Entity;
--- cyphesis-0.5.15/common/globals.cpp.orig	2008-02-10 16:23:25.000000000 -0800
+++ cyphesis-0.5.15/common/globals.cpp	2008-02-10 16:23:34.000000000 -0800
@@ -37,6 +37,7 @@
 #include <sys/stat.h>
 
 #include <cassert>
+#include <cstring>
 
 const char * CYPHESIS = "cyphesis";
 const char * CLIENT = "client";
--- cyphesis-0.5.15/common/id.cpp.orig	2008-02-10 16:04:31.000000000 -0800
+++ cyphesis-0.5.15/common/id.cpp	2008-02-10 16:34:16.000000000 -0800
@@ -22,6 +22,8 @@
 #include "common/compose.hpp"
 
 #include <cassert>
+#include <cstring>
+#include <cstdlib>
 
 long integerId(const std::string & id)
 {
--- cyphesis-0.5.15/rulesets/Container.h.orig	2008-02-10 17:18:48.000000000 -0800
+++ cyphesis-0.5.15/rulesets/Container.h	2008-02-10 17:19:19.000000000 -0800
@@ -25,6 +25,7 @@
 #include <set>
 #include <map>
 #include <vector>
+#include <string>
 
 class Entity;