diff -Naur ChannelArchiver.old/LibIO/BinValue.cpp ChannelArchiver.new/LibIO/BinValue.cpp
--- ChannelArchiver.old/LibIO/BinValue.cpp	2014-04-14 13:52:02.162108815 +0200
+++ ChannelArchiver.new/LibIO/BinValue.cpp	2014-04-14 13:52:54.822687572 +0200
@@ -1,11 +1,12 @@
 // BinValue.cpp
 
 #include <stdlib.h>
+#include <climits>
 #include <math.h> // MSVisC has HUGE_VAL in here?!
 #include <MemoryBuffer.h>
 #include "ArchiveException.h"
 #include "BinValue.h"
-
+  
 // Create a value suitable for the given DbrType
 BinValue *BinValue::create(DbrType type, DbrCount count)
 {
diff -Naur ChannelArchiver.old/LibIO/DataFile.h ChannelArchiver.new/LibIO/DataFile.h
--- ChannelArchiver.old/LibIO/DataFile.h	2014-04-14 13:52:02.162108815 +0200
+++ ChannelArchiver.new/LibIO/DataFile.h	2014-04-14 13:52:54.822687572 +0200
@@ -127,7 +127,7 @@
     const stdString &getDirname () {   return _dirname;  }
     const stdString &getBasename() {   return _basename; }
 
-    DataHeaderIterator addHeader(
+    class DataHeaderIterator addHeader(
         DataHeader &new_header,
         const CtrlInfo &ctrl_info,
         DataHeaderIterator *prev_header // may be 0
diff -Naur ChannelArchiver.old/Tools/ArgParser.cpp ChannelArchiver.new/Tools/ArgParser.cpp
--- ChannelArchiver.old/Tools/ArgParser.cpp	2014-04-14 13:52:02.202131680 +0200
+++ ChannelArchiver.new/Tools/ArgParser.cpp	2014-04-14 13:52:54.790113755 +0200
@@ -11,6 +11,7 @@
 #include"Filename.h"
 #include"ArgParser.h"
 #include<stdio.h>
+#include<stdlib.h>
 
 CmdArgParser::CmdArgParser(int argc, char const * const *argv)
 {
diff -Naur ChannelArchiver.old/Tools/AVLTree.h ChannelArchiver.new/Tools/AVLTree.h
--- ChannelArchiver.old/Tools/AVLTree.h	2014-04-14 13:52:02.202131680 +0200
+++ ChannelArchiver.new/Tools/AVLTree.h	2014-04-14 13:52:54.794122464 +0200
@@ -15,6 +15,17 @@
 #include <GenericException.h>
 #include <AutoFilePtr.h>
 
+static int sort_compare(const int &a, const int &b)
+{   return b-a; }
+
+static const char *toString(const int &i)
+{
+    static char txt[10];
+    sprintf(txt, "%d", i);
+    return txt;
+}
+            
+
 // Tree Item:
 // Holds the full Item as well as left/right pointers
 template<class Item> class AVLItem
diff -Naur ChannelArchiver.old/Tools/AVLTreeTest.cpp ChannelArchiver.new/Tools/AVLTreeTest.cpp
--- ChannelArchiver.old/Tools/AVLTreeTest.cpp	2014-04-14 13:52:02.202131680 +0200
+++ ChannelArchiver.new/Tools/AVLTreeTest.cpp	2014-04-14 13:52:54.790113755 +0200
@@ -1,9 +1,10 @@
 
 #include "AVLTree.h"
 #include "UnitTest.h"
+#include <cstdlib>
 
-static int sort_compare(const int &a, const int &b)
-{   return b-a; }
+//static int sort_compare(const int &a, const int &b)
+//{   return b-a; }
 
 static int avl_last_number;
 static bool tree_is_ordered;
@@ -15,12 +16,12 @@
     avl_last_number = i;
 }
 
-static const char *toString(const int &i)
-{
-    static char txt[10];
-    sprintf(txt, "%d", i);
-    return txt;
-}
+//static const char *toString(const int &i)
+//{
+//    static char txt[10];
+//    sprintf(txt, "%d", i);
+//    return txt;
+//}
 
 TEST_CASE avl_test()
 {
diff -Naur ChannelArchiver.old/Tools/Bitset.cpp ChannelArchiver.new/Tools/Bitset.cpp
--- ChannelArchiver.old/Tools/Bitset.cpp	2014-04-14 13:52:02.202131680 +0200
+++ ChannelArchiver.new/Tools/Bitset.cpp	2014-04-14 13:52:54.794122464 +0200
@@ -2,6 +2,7 @@
 // Tools
 #include "Bitset.h"
 #include "GenericException.h"
+#include <cstdarg>
 
 BitSet::BitSet()
 {
diff -Naur ChannelArchiver.old/Tools/GenericException.cpp ChannelArchiver.new/Tools/GenericException.cpp
--- ChannelArchiver.old/Tools/GenericException.cpp	2014-04-14 13:52:02.206118714 +0200
+++ ChannelArchiver.new/Tools/GenericException.cpp	2014-04-14 13:52:54.790113755 +0200
@@ -2,6 +2,7 @@
 // System
 #include <stdio.h>
 #include <stdarg.h>
+#include <cstdlib>
 
 // Tools
 #include "GenericException.h"
diff -Naur ChannelArchiver.old/Tools/GenericException.h ChannelArchiver.new/Tools/GenericException.h
--- ChannelArchiver.old/Tools/GenericException.h	2014-04-14 13:52:02.206118714 +0200
+++ ChannelArchiver.new/Tools/GenericException.h	2014-04-14 13:52:54.790113755 +0200
@@ -7,6 +7,7 @@
 #ifdef USE_STD_EXCEPTION
 #include <exception>
 #endif
+#include <cstdarg>
 
 /// \ingroup Tools
 
diff -Naur ChannelArchiver.old/Tools/GenericExceptionTest.cpp ChannelArchiver.new/Tools/GenericExceptionTest.cpp
--- ChannelArchiver.old/Tools/GenericExceptionTest.cpp	2014-04-14 13:52:02.206118714 +0200
+++ ChannelArchiver.new/Tools/GenericExceptionTest.cpp	2014-04-14 13:52:54.794122464 +0200
@@ -1,6 +1,7 @@
 
 #include "ArchiveException.h"
 #include "UnitTest.h"
+#include <cstdlib>
 
 class Huge
 {
diff -Naur ChannelArchiver.old/Tools/MemoryBuffer.h ChannelArchiver.new/Tools/MemoryBuffer.h
--- ChannelArchiver.old/Tools/MemoryBuffer.h	2014-04-14 13:52:02.206118714 +0200
+++ ChannelArchiver.new/Tools/MemoryBuffer.h	2014-04-14 13:52:54.794122464 +0200
@@ -5,6 +5,7 @@
 // Tools
 #include <GenericException.h>
 #include <NoCopy.h>
+#include <cstdlib>
 
 /** \ingroup Tools
  *  A memory region that can be resized.
diff -Naur ChannelArchiver.old/Tools/UnitTestLib.cpp ChannelArchiver.new/Tools/UnitTestLib.cpp
--- ChannelArchiver.old/Tools/UnitTestLib.cpp	2014-04-14 13:52:02.214126158 +0200
+++ ChannelArchiver.new/Tools/UnitTestLib.cpp	2014-04-14 13:52:54.790113755 +0200
@@ -3,6 +3,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <cstdio>
 // Tools
 #include "GenericException.h"
 
diff -Naur ChannelArchiver.old/XMLRPCServer/ArchiveDataServer.cpp ChannelArchiver.new/XMLRPCServer/ArchiveDataServer.cpp
--- ChannelArchiver.old/XMLRPCServer/ArchiveDataServer.cpp	2014-04-14 13:52:02.214126158 +0200
+++ ChannelArchiver.new/XMLRPCServer/ArchiveDataServer.cpp	2014-04-14 13:52:54.786109060 +0200
@@ -551,8 +551,11 @@
 // { int32  ver, string desc } = archiver.info()
 xmlrpc_value *get_info(xmlrpc_env *env, xmlrpc_value *args, void *user)
 {
-    extern const char *alarmStatusString[];
-    extern const char *alarmSeverityString[];
+//    extern const char *alarmStatusString[];
+//    extern const char *alarmSeverityString[];
+    extern const char *epicsAlarmConditionStrings[ALARM_NSTATUS];
+    extern const char *epicsAlarmSeverityStrings[ALARM_NSEV];
+        
 #ifdef LOGFILE
     LOG_MSG("archiver.info\n");
 #endif
@@ -586,7 +589,8 @@
         return 0;
     for (i=0; i<=lastEpicsAlarmCond; ++i)
     {
-        element = xmlrpc_build_value(env, "s", alarmStatusString[i]);
+//        element = xmlrpc_build_value(env, "s", alarmStatusString[i]);
+        element = xmlrpc_build_value(env, "s", epicsAlarmConditionStrings[i]);
         xmlrpc_array_append_item(env, status, element);
         if (env->fault_occurred)
             return 0;
@@ -597,7 +601,8 @@
     {
         element = xmlrpc_build_value(env, "{s:i,s:s,s:b,s:b}",
                                      "num", (xmlrpc_int32)i,
-                                     "sevr", alarmSeverityString[i],
+                                     "sevr", epicsAlarmSeverityStrings[i],
+//                                     "sevr", alarmSeverityString[i],
                                      "has_value", (xmlrpc_bool) 1,
                                      "txt_stat", (xmlrpc_bool) 1);
         xmlrpc_array_append_item(env, severity, element);
diff -Naur ChannelArchiver.old/XMLRPCServer/xmlrpc-config-wrapper ChannelArchiver.new/XMLRPCServer/xmlrpc-config-wrapper
--- ChannelArchiver.old/XMLRPCServer/xmlrpc-config-wrapper	2014-04-14 13:52:02.218120241 +0200
+++ ChannelArchiver.new/XMLRPCServer/xmlrpc-config-wrapper	2014-04-14 13:52:54.782119305 +0200
@@ -1,10 +1,12 @@
 #!/bin/sh
 
-v=`xmlrpc-c-config --version`
+v=`/usr/bin/xmlrpc-c-config --version`
 
 case $v in
   1.0*) client="client"
         ;;
+  1.1*) client="client"
+        ;;
   0.*)  client="libwww-client"
         ;;
   *)    echo "Cannot run or decode 'xmlrpc-c-config'"
@@ -12,13 +14,13 @@
 esac
 
 case $1 in
-   server-flags)   xmlrpc-c-config cgi-server --cflags
+   server-flags)   /usr/bin/xmlrpc-c-config cgi-server --cflags
 		   ;;
-   cgi-libs)       xmlrpc-c-config cgi-server --libs
+   cgi-libs)       /usr/bin/xmlrpc-c-config cgi-server --libs
                    ;;
-   abyss-libs)     xmlrpc-c-config abyss-server --libs
+   abyss-libs)     /usr/bin/xmlrpc-c-config abyss-server --libs
                    ;;
-   client-libs)    xmlrpc-c-config $client --libs
+   client-libs)    /usr/bin/xmlrpc-c-config $client --libs
                    ;;
    *)              echo "USAGE: See source code"
                    exit 2