diff -uNr CondDBMySQL.ORIG/src/Blob.cxx CondDBMySQL/src/Blob.cxx
--- CondDBMySQL.ORIG/src/Blob.cxx	2006-11-15 23:04:44.000000000 +0900
+++ CondDBMySQL/src/Blob.cxx	2009-03-20 16:46:59.000000000 +0900
@@ -20,6 +20,9 @@
 
 #include "Blob.h"
 #include <iostream>
+#ifdef __APPLE__
+#include <cstring>
+#endif
 #ifndef _WIN32
 #include <config.h>
 #define atoi64(x) atoll(x)
diff -uNr CondDBMySQL.ORIG/src/CondDBLog.h CondDBMySQL/src/CondDBLog.h
--- CondDBMySQL.ORIG/src/CondDBLog.h	2006-11-15 23:04:44.000000000 +0900
+++ CondDBMySQL/src/CondDBLog.h	2009-03-20 16:42:51.000000000 +0900
@@ -55,7 +55,12 @@
 
 extern "C" {
 #include <mysql.h>
+#ifndef __APPLE__
 #include <stdio.h>
+#else
+#include <cstdio>
+#include <cstdlib>
+#endif
 }
 
 // NOTES: At creation of the object variable user takes a value. This means that at 
diff -uNr CondDBMySQL.ORIG/src/Debug.cxx CondDBMySQL/src/Debug.cxx
--- CondDBMySQL.ORIG/src/Debug.cxx	2006-11-15 23:04:44.000000000 +0900
+++ CondDBMySQL/src/Debug.cxx	2009-03-20 16:44:09.000000000 +0900
@@ -37,7 +37,13 @@
 #include <iomanip>
 
 // for sprintf
+#ifndef __APPLE__
 #include <stdio.h>
+#else
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#endif
 
 #ifndef NO_DEBUG
 
diff -uNr CondDBMySQL.ORIG/tests/basicSession/basicSession.cxx CondDBMySQL/tests/basicSession/basicSession.cxx
--- CondDBMySQL.ORIG/tests/basicSession/basicSession.cxx	2006-11-15 23:09:22.000000000 +0900
+++ CondDBMySQL/tests/basicSession/basicSession.cxx	2009-03-20 16:50:31.000000000 +0900
@@ -41,7 +41,7 @@
 #include <iostream>
 using namespace std;
 
-int main ( int /*argc*/, char* /*argv[]*/ )
+int main ( int /*argc*/, char** /*argv[]*/ )
 {
     try {
 
diff -uNr CondDBMySQL.ORIG/tests/createTags/createTags.cxx CondDBMySQL/tests/createTags/createTags.cxx
--- CondDBMySQL.ORIG/tests/createTags/createTags.cxx	2006-11-15 23:11:34.000000000 +0900
+++ CondDBMySQL/tests/createTags/createTags.cxx	2009-03-20 16:52:14.000000000 +0900
@@ -41,7 +41,7 @@
 #include <iostream>
 using namespace std;
 
-int main ( int /*argc*/, char* /*argv[]*/ )
+int main ( int /*argc*/, char** /*argv[]*/ )
 {
     try {
 
diff -uNr CondDBMySQL.ORIG/tests/performanceTests/performanceTests.cxx CondDBMySQL/tests/performanceTests/performanceTests.cxx
--- CondDBMySQL.ORIG/tests/performanceTests/performanceTests.cxx	2006-11-15 23:11:36.000000000 +0900
+++ CondDBMySQL/tests/performanceTests/performanceTests.cxx	2009-03-20 16:53:41.000000000 +0900
@@ -26,7 +26,12 @@
 
 #include <string>
 #include <iostream>
+#ifndef __APPLE__
 #include <stdio.h>
+#else
+#include <cstdio>
+#include <cstdlib>
+#endif
 
 #include <mysql.h>
 #include "sys/time.h"
diff -uNr CondDBMySQL.ORIG/tests/readDatax/readDatax.cxx CondDBMySQL/tests/readDatax/readDatax.cxx
--- CondDBMySQL.ORIG/tests/readDatax/readDatax.cxx	2006-11-15 23:11:38.000000000 +0900
+++ CondDBMySQL/tests/readDatax/readDatax.cxx	2009-03-20 16:54:15.000000000 +0900
@@ -73,7 +73,7 @@
 
 
 
-int main ( int /*argc*/, char* /*argv[]*/ )
+int main ( int /*argc*/, char** /*argv[]*/ )
 {
   string folder = "/cal/temp";
   //  CondDBKey point = 15;
diff -uNr CondDBMySQL.ORIG/tests/readTable/readTable.cxx CondDBMySQL/tests/readTable/readTable.cxx
--- CondDBMySQL.ORIG/tests/readTable/readTable.cxx	2006-11-15 23:11:40.000000000 +0900
+++ CondDBMySQL/tests/readTable/readTable.cxx	2009-03-20 16:55:15.000000000 +0900
@@ -30,6 +30,9 @@
 #include "ConditionsDB/CondDBMySQLTableFactory.h"
 #include "ConditionsDB/ICondDBTable.h"
 //#include "CondDBTable.h"
+#ifdef __APPLE__
+#include <cstdlib>
+#endif
 
 #include <string>
 #include <iostream>
diff -uNr CondDBMySQL.ORIG/tests/readTableVer/readTableVer.cxx CondDBMySQL/tests/readTableVer/readTableVer.cxx
--- CondDBMySQL.ORIG/tests/readTableVer/readTableVer.cxx	2006-11-15 23:11:43.000000000 +0900
+++ CondDBMySQL/tests/readTableVer/readTableVer.cxx	2009-03-20 16:56:11.000000000 +0900
@@ -31,6 +31,9 @@
 #include "ConditionsDB/CondDBMySQLTableFactory.h"
 #include "ConditionsDB/ICondDBTable.h"
 
+#ifdef __APPLE__
+#include <cstdlib>
+#endif
 
 #include <string>
 #include <iostream>
diff -uNr CondDBMySQL.ORIG/tests/storeDatax/storeDatax.cxx CondDBMySQL/tests/storeDatax/storeDatax.cxx
--- CondDBMySQL.ORIG/tests/storeDatax/storeDatax.cxx	2006-11-15 23:11:47.000000000 +0900
+++ CondDBMySQL/tests/storeDatax/storeDatax.cxx	2009-03-20 16:57:17.000000000 +0900
@@ -27,6 +27,10 @@
 #include "ConditionsDB/CondDBObjFactory.h"
 #include "exampleObject.h"
 
+#ifdef __APPLE__
+#include <cstdlib>
+#endif
+
 using namespace std;
 
 #include <string>
diff -uNr CondDBMySQL.ORIG/tests/storeTable/storeTable.cxx CondDBMySQL/tests/storeTable/storeTable.cxx
--- CondDBMySQL.ORIG/tests/storeTable/storeTable.cxx	2006-11-15 23:11:51.000000000 +0900
+++ CondDBMySQL/tests/storeTable/storeTable.cxx	2009-03-20 16:57:52.000000000 +0900
@@ -31,6 +31,10 @@
 #include "ConditionsDB/ICondDBTable.h"
 //#include "CondDBTable.h"
 
+#ifdef __APPLE__
+#include <cstdlib>
+#endif
+
 using namespace std;
 
 #include <string>
diff -uNr CondDBMySQL.ORIG/tests/storeTableVer/storeTableVer.cxx CondDBMySQL/tests/storeTableVer/storeTableVer.cxx
--- CondDBMySQL.ORIG/tests/storeTableVer/storeTableVer.cxx	2006-11-15 23:11:53.000000000 +0900
+++ CondDBMySQL/tests/storeTableVer/storeTableVer.cxx	2009-03-20 16:58:23.000000000 +0900
@@ -30,6 +30,10 @@
 #include "ConditionsDB/CondDBMySQLTableFactory.h"
 #include "ConditionsDB/ICondDBTable.h"
 
+#ifdef __APPLE__
+#include <cstdlib>
+#endif
+
 
 using namespace std;
 
diff -uNr CondDBMySQL.ORIG/tests/testTableTags/testTableTags.cxx CondDBMySQL/tests/testTableTags/testTableTags.cxx
--- CondDBMySQL.ORIG/tests/testTableTags/testTableTags.cxx	2006-11-15 23:11:58.000000000 +0900
+++ CondDBMySQL/tests/testTableTags/testTableTags.cxx	2009-03-20 16:59:20.000000000 +0900
@@ -23,6 +23,10 @@
 #include <ConditionsDB/CondDBMySQLTableFactory.h>
 #include <ConditionsDB/ICondDBTable.h>
 
+#ifdef __APPLE__
+#include <cstdlib>
+#endif
+
 
 #include <string>
 #include <iostream>
@@ -44,7 +48,7 @@
 }
 
 
-int main ( int /*argc*/, char* /*argv[]*/ )
+int main ( int /*argc*/, char** /*argv[]*/ )
 {
     string folder = "/muon/dcs/tableTag";
 
diff -uNr CondDBMySQL.ORIG/tests/testTags/testTags.cxx CondDBMySQL/tests/testTags/testTags.cxx
--- CondDBMySQL.ORIG/tests/testTags/testTags.cxx	2006-11-15 23:12:00.000000000 +0900
+++ CondDBMySQL/tests/testTags/testTags.cxx	2009-03-20 16:59:52.000000000 +0900
@@ -43,7 +43,7 @@
 using namespace std;
 // this requires the previous run of example basicSession
 
-int main ( int /*argc*/, char* /*argv[]*/ )
+int main ( int /*argc*/, char** /*argv[]*/ )
 {
     string folder = "/LHCb/Atlas/Tile/cal/Module_1";