--- xchatosd-5.19/my_xosd.h.orig	2006-07-15 14:12:55.000000000 +0100
+++ xchatosd-5.19/my_xosd.h	2006-07-15 14:13:04.000000000 +0100
@@ -8,8 +8,8 @@
 
 class XOsd {
 	public:
-		XOsd::XOsd(int);
-		XOsd::~XOsd();
+		XOsd(int);
+		~XOsd();
 		int setPos(string);
 		int setVOffset(int);
 		int setHOffset(int);
--- xchatosd-5.19/xchatosd_conf.h.orig	2006-07-15 14:05:09.000000000 +0100
+++ xchatosd-5.19/xchatosd_conf.h	2006-07-15 14:05:40.000000000 +0100
@@ -11,8 +11,8 @@
 
 class XOsdConf {
 	public:
-		XOsdConf::XOsdConf();
-		XOsdConf::~XOsdConf();
+		XOsdConf();
+		~XOsdConf();
 		int read(string);
 		int write(string);
 		int getiValue(string);
--- xchatosd-5.19b/xchatosd_conf.cpp	2009-01-22 01:15:50.000000000 -0400
+++ xchatosd-5.19/xchatosd_conf.cpp	2009-01-22 01:16:18.000000000 -0400
@@ -1,4 +1,6 @@
 #include "xchatosd_conf.h"
+#include <cstdlib>
+#include <cstring>
 
 XOsdConf::XOsdConf()
 {
--- xchatosd-5.19b/xchatosd.cpp	2009-01-22 01:15:50.000000000 -0400
+++ xchatosd-5.19/xchatosd.cpp	2009-01-22 01:18:22.000000000 -0400
@@ -3,8 +3,7 @@
 #include <fstream>
 #include <iostream>
 #include <xosd.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstring>
 #include <langinfo.h>
 #include "xchatosd.h"
 #include "xchatosd_lang.h"
@@ -22,7 +21,7 @@
 static xchat_plugin *ph;
 static XOsd *osd = NULL;
 static XOsdConf config;
-static char *codepage;
+static char const *codepage;
 #ifdef ICONV_LIB
 static iconv_t iconv_desc = (iconv_t) (-1);
 #endif
@@ -445,8 +444,8 @@
 
 extern "C" { int
 xchat_plugin_init(xchat_plugin * plugin_handle,
-		  char **plugin_name,
-		  char **plugin_desc, char **plugin_version, char *arg)
+		  char const **plugin_name,
+		  char const **plugin_desc, char const **plugin_version, char *arg)
 {
 	ph = plugin_handle;
 	XOSDconfRead();