--- libxbase-2.0.0.orig/xbase/expfunc.cpp
+++ libxbase-2.0.0/xbase/expfunc.cpp
@@ -58,8 +58,8 @@
 
 #include <ctype.h>
 #include <math.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 #include <xbase/exp.h>
 #include <xbase/xbexcept.h>
@@ -327,7 +327,7 @@
       break;
 
       default:
-      cout << "\nInternal error. " << ptype;
+      std::cout << "\nInternal error. " << ptype;
       break;
    }
    Push( (void *) WorkNode );