--- Atlas/Filter.cpp.orig
+++ Atlas/Filter.cpp
@@ -4,6 +4,8 @@
 
 #include <Atlas/Filter.h>
 
+#include <string.h>
+
 namespace Atlas {
 
 Filter::Filter(Filter* next)
@@ -41,9 +43,9 @@
 
     if (numPutback > m_inPutback) numPutback = m_inPutback;
 
-    std::memcpy(m_outBuffer + (m_inPutback - numPutback),
-                gptr() - numPutback,
-                (unsigned long) numPutback);
+    ::memcpy(m_outBuffer + (m_inPutback - numPutback),
+             gptr() - numPutback,
+             (unsigned long) numPutback);
 
     int num;
 
only in patch2:
unchanged:
--- tools/atlas_convert.cpp.orig
+++ tools/atlas_convert.cpp
@@ -14,6 +14,7 @@
 #include <fstream>
 #include <iostream>
 
+#include <stdlib.h>
 #include <unistd.h>
 
 int option_format = 0;