--- calcchecksum/calcchecksum.cpp	2004-01-16 19:10:47.000000000 +0000
+++ calcchecksum/calcchecksum.cpp	2008-11-26 20:34:03.000000000 +0000
@@ -9,6 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <cstdlib>
 
 #include <qlineedit.h>
 #include <qlabel.h>
@@ -86,7 +87,7 @@
 			   "Quit some other programs.\n"
 			   "CalcChecksum will be terminated now!");
 		printError(err);
-		exit(1);
+		std::exit(1);
 	}
 	connect(comm, SIGNAL(lineAvailable_signal(const string*)), this, SLOT(handleProgressRequest(const string*)));
 
@@ -624,11 +625,11 @@
 		}
 	} else if (unlikely(c == 'S')) {
 		// Progressbar top-value (total-steps value)
-		progressBar->setTotalSteps(atoi(data->substr(1,
+		progressBar->setTotalSteps(std::atoi(data->substr(1,
 					   data->length()).c_str()));
 	} else {
 		// push progressBar
-		progressBar->setProgress(atoi(data->c_str()));
+		progressBar->setProgress(std::atoi(data->c_str()));
 	}
 }
 
diff -Naur ./calcchecksum/globalstuff.cpp ../calcchecksum-1.6-pre1.patched/calcchecksum/globalstuff.cpp
--- ./calcchecksum/globalstuff.cpp	2004-01-13 17:25:56.000000000 +0000
+++ ../calcchecksum-1.6-pre1.patched/calcchecksum/globalstuff.cpp	2008-11-26 20:35:50.000000000 +0000
@@ -11,6 +11,7 @@
 
 #include "globalstuff.h"
 
+#include <cstring>
 #include <stdio.h>
 #include <sys/stat.h>
 
@@ -29,7 +30,7 @@
 			ret += "00";
 		} else {
 			sprintf(tmp, "%X", 0xFF & *(buf + i));
-			if (strlen(tmp) == 1)
+			if (std::strlen(tmp) == 1)
 				ret += '0';
 			ret += tmp;
 		}