--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -, +, @@ 
--- xstow-0.5.1.orig/src/format.h
+++ xstow-0.5.1/src/format.h
@@ -648,17 +648,17 @@ 
 		
 		switch( num_of_args )
 		{
-		    case 1: n = std::snprintf( buffer, buffer_size, format.c_str(),
+		    case 1: n = snprintf( buffer, buffer_size, format.c_str(),
 					       D( a ) ); break;
-		    case 2: n = std::snprintf( buffer, buffer_size, format.c_str(),
+		    case 2: n = snprintf( buffer, buffer_size, format.c_str(),
 					       D( a ), D( b ) ); break;
-		    case 3: n = std::snprintf( buffer, buffer_size, format.c_str(),
+		    case 3: n = snprintf( buffer, buffer_size, format.c_str(),
 					       D( a ), D( b ), D( c ) ); break;
-		    case 4: n = std::snprintf( buffer, buffer_size, format.c_str(),
+		    case 4: n = snprintf( buffer, buffer_size, format.c_str(),
 					       D( a ), D( b ), D( c ), D( d ) ); break;
-		    case 5: n = std::snprintf( buffer, buffer_size, format.c_str(),
+		    case 5: n = snprintf( buffer, buffer_size, format.c_str(),
 					       D( a ), D( b ), D( c ), D( d ), D( e ) ); break;
-		    case 6: n = std::snprintf( buffer, buffer_size, format.c_str(),
+		    case 6: n = snprintf( buffer, buffer_size, format.c_str(),
 					       D( a ), D( b ), D( c ), D( d ), D( e ), D( f ) ); break;
 		}
 		
--- xstow-0.5.1.orig/src/main.cpp
+++ xstow-0.5.1/src/main.cpp
@@ -1,3 +1,4 @@ 
+#include <cstdlib>
 #include <iostream>
 
 #include "local_config.h"
--- xstow-0.5.1.orig/src/cppdir.cpp
+++ xstow-0.5.1/src/cppdir.cpp
@@ -1,6 +1,8 @@ 
 #include "cppdir.h"
 #include "debug.h"
 
+#include <cstdlib>
+
 #define OUT(level) DEBUG_OUT( level, MODULE_CPPDIR)
 
 extern "C" {
--- xstow-0.5.1.orig/src/setup.cpp
+++ xstow-0.5.1/src/setup.cpp
@@ -5,6 +5,8 @@ 
 #include "debug.h"
 #include "nignore.h"
 
+#include <cstdlib>
+
 #undef OUT
 
 #define OUT( level ) DEBUG_OUT( level, MODULE_SETUP )
--- xstow-0.5.1.orig/src/tree.cpp
+++ xstow-0.5.1/src/tree.cpp
@@ -26,6 +26,7 @@ 
 
 
 #include <algorithm>
+#include <cstring>
 
 #define OUT(level) DEBUG_OUT(level, MODULE_TREE)