diff --git a/include/dbus-c++/error.h b/include/dbus-c++/error.h
index 62cbe89..7dec7bf 100644
--- a/include/dbus-c++/error.h
+++ b/include/dbus-c++/error.h
@@ -72,211 +72,211 @@ private:
 
 struct DXXAPI ErrorFailed : public Error
 {
-	ErrorFailed(const char *msg)
-	: Error("org.freedesktop.DBus.Error.Failed", msg)
+	ErrorFailed(const char *message)
+	: Error("org.freedesktop.DBus.Error.Failed", message)
 	{}
 };
 
 struct DXXAPI ErrorNoMemory : public Error
 {
-	ErrorNoMemory(const char *msg)
-	: Error("org.freedesktop.DBus.Error.NoMemory", msg)
+	ErrorNoMemory(const char *message)
+	: Error("org.freedesktop.DBus.Error.NoMemory", message)
 	{}
 };
 
 struct DXXAPI ErrorServiceUnknown : public Error
 {
-	ErrorServiceUnknown(const char *msg)
-	: Error("org.freedesktop.DBus.Error.ServiceUnknown", msg)
+	ErrorServiceUnknown(const char *message)
+	: Error("org.freedesktop.DBus.Error.ServiceUnknown", message)
 	{}
 };
 
 struct DXXAPI ErrorNameHasNoOwner : public Error
 {
-	ErrorNameHasNoOwner(const char *msg)
-	: Error("org.freedesktop.DBus.Error.NameHasNoOwner", msg)
+	ErrorNameHasNoOwner(const char *message)
+	: Error("org.freedesktop.DBus.Error.NameHasNoOwner", message)
 	{}
 };
 
 struct DXXAPI ErrorNoReply : public Error
 {
-	ErrorNoReply(const char *msg)
-	: Error("org.freedesktop.DBus.Error.NoReply", msg)
+	ErrorNoReply(const char *message)
+	: Error("org.freedesktop.DBus.Error.NoReply", message)
 	{}
 };
 
 struct DXXAPI ErrorIOError : public Error
 {
-	ErrorIOError(const char *msg)
-	: Error("org.freedesktop.DBus.Error.IOError", msg)
+	ErrorIOError(const char *message)
+	: Error("org.freedesktop.DBus.Error.IOError", message)
 	{}
 };
 
 struct DXXAPI ErrorBadAddress : public Error
 {
-	ErrorBadAddress(const char *msg)
-	: Error("org.freedesktop.DBus.Error.BadAddress", msg)
+	ErrorBadAddress(const char *message)
+	: Error("org.freedesktop.DBus.Error.BadAddress", message)
 	{}
 };
 
 struct DXXAPI ErrorNotSupported : public Error
 {
-	ErrorNotSupported(const char *msg)
-	: Error("org.freedesktop.DBus.Error.NotSupported", msg)
+	ErrorNotSupported(const char *message)
+	: Error("org.freedesktop.DBus.Error.NotSupported", message)
 	{}
 };
 
 struct DXXAPI ErrorLimitsExceeded : public Error
 {
-	ErrorLimitsExceeded(const char *msg)
-	: Error("org.freedesktop.DBus.Error.LimitsExceeded", msg)
+	ErrorLimitsExceeded(const char *message)
+	: Error("org.freedesktop.DBus.Error.LimitsExceeded", message)
 	{}
 };
 
 struct DXXAPI ErrorAccessDenied : public Error
 {
-	ErrorAccessDenied(const char *msg)
-	: Error("org.freedesktop.DBus.Error.AccessDenied", msg)
+	ErrorAccessDenied(const char *message)
+	: Error("org.freedesktop.DBus.Error.AccessDenied", message)
 	{}
 };
 
 struct DXXAPI ErrorAuthFailed : public Error
 {
-	ErrorAuthFailed(const char *msg)
-	: Error("org.freedesktop.DBus.Error.AuthFailed", msg)
+	ErrorAuthFailed(const char *message)
+	: Error("org.freedesktop.DBus.Error.AuthFailed", message)
 	{}
 };
 
 struct DXXAPI ErrorNoServer : public Error
 {
-	ErrorNoServer(const char *msg)
-	: Error("org.freedesktop.DBus.Error.NoServer", msg)
+	ErrorNoServer(const char *message)
+	: Error("org.freedesktop.DBus.Error.NoServer", message)
 	{}
 };
 
 struct DXXAPI ErrorTimeout : public Error
 {
-	ErrorTimeout(const char *msg)
-	: Error("org.freedesktop.DBus.Error.Timeout", msg)
+	ErrorTimeout(const char *message)
+	: Error("org.freedesktop.DBus.Error.Timeout", message)
 	{}
 };
 
 struct DXXAPI ErrorNoNetwork : public Error
 {
-	ErrorNoNetwork(const char *msg)
-	: Error("org.freedesktop.DBus.Error.NoNetwork", msg)
+	ErrorNoNetwork(const char *message)
+	: Error("org.freedesktop.DBus.Error.NoNetwork", message)
 	{}
 };
 
 struct DXXAPI ErrorAddressInUse : public Error
 {
-	ErrorAddressInUse(const char *msg)
-	: Error("org.freedesktop.DBus.Error.AddressInUse", msg)
+	ErrorAddressInUse(const char *message)
+	: Error("org.freedesktop.DBus.Error.AddressInUse", message)
 	{}
 };
 
 struct DXXAPI ErrorDisconnected : public Error
 {
-	ErrorDisconnected(const char *msg)
-	: Error("org.freedesktop.DBus.Error.Disconnected", msg)
+	ErrorDisconnected(const char *message)
+	: Error("org.freedesktop.DBus.Error.Disconnected", message)
 	{}
 };
 
 struct DXXAPI ErrorInvalidArgs : public Error
 {
-	ErrorInvalidArgs(const char *msg)
-	: Error("org.freedesktop.DBus.Error.InvalidArgs", msg)
+	ErrorInvalidArgs(const char *message)
+	: Error("org.freedesktop.DBus.Error.InvalidArgs", message)
 	{}
 };
 
 struct DXXAPI ErrorFileNotFound : public Error
 {
-	ErrorFileNotFound(const char *msg)
-	: Error("org.freedesktop.DBus.Error.FileNotFound", msg)
+	ErrorFileNotFound(const char *message)
+	: Error("org.freedesktop.DBus.Error.FileNotFound", message)
 	{}
 };
 
 struct DXXAPI ErrorUnknownMethod : public Error
 {
-	ErrorUnknownMethod(const char *msg)
-	: Error("org.freedesktop.DBus.Error.UnknownMethod", msg)
+	ErrorUnknownMethod(const char *message)
+	: Error("org.freedesktop.DBus.Error.UnknownMethod", message)
 	{}
 };
 
 struct DXXAPI ErrorTimedOut : public Error
 {
-	ErrorTimedOut(const char *msg)
-	: Error("org.freedesktop.DBus.Error.TimedOut", msg)
+	ErrorTimedOut(const char *message)
+	: Error("org.freedesktop.DBus.Error.TimedOut", message)
 	{}
 };
 
 struct DXXAPI ErrorMatchRuleNotFound : public Error
 {
-	ErrorMatchRuleNotFound(const char *msg)
-	: Error("org.freedesktop.DBus.Error.MatchRuleNotFound", msg)
+	ErrorMatchRuleNotFound(const char *message)
+	: Error("org.freedesktop.DBus.Error.MatchRuleNotFound", message)
 	{}
 };
 
 struct DXXAPI ErrorMatchRuleInvalid : public Error
 {
-	ErrorMatchRuleInvalid(const char *msg)
-	: Error("org.freedesktop.DBus.Error.MatchRuleInvalid", msg)
+	ErrorMatchRuleInvalid(const char *message)
+	: Error("org.freedesktop.DBus.Error.MatchRuleInvalid", message)
 	{}
 };
 
 struct DXXAPI ErrorSpawnExecFailed : public Error
 {
-	ErrorSpawnExecFailed(const char *msg)
-	: Error("org.freedesktop.DBus.Error.Spawn.ExecFailed", msg)
+	ErrorSpawnExecFailed(const char *message)
+	: Error("org.freedesktop.DBus.Error.Spawn.ExecFailed", message)
 	{}
 };
 
 struct DXXAPI ErrorSpawnForkFailed : public Error
 {
-	ErrorSpawnForkFailed(const char *msg)
-	: Error("org.freedesktop.DBus.Error.Spawn.ForkFailed", msg)
+	ErrorSpawnForkFailed(const char *message)
+	: Error("org.freedesktop.DBus.Error.Spawn.ForkFailed", message)
 	{}
 };
 
 struct DXXAPI ErrorSpawnChildExited : public Error
 {
-	ErrorSpawnChildExited(const char *msg)
-	: Error("org.freedesktop.DBus.Error.Spawn.ChildExited", msg)
+	ErrorSpawnChildExited(const char *message)
+	: Error("org.freedesktop.DBus.Error.Spawn.ChildExited", message)
 	{}
 };
 
 struct DXXAPI ErrorSpawnChildSignaled : public Error
 {
-	ErrorSpawnChildSignaled(const char *msg)
-	: Error("org.freedesktop.DBus.Error.Spawn.ChildSignaled", msg)
+	ErrorSpawnChildSignaled(const char *message)
+	: Error("org.freedesktop.DBus.Error.Spawn.ChildSignaled", message)
 	{}
 };
 
 struct DXXAPI ErrorSpawnFailed : public Error
 {
-	ErrorSpawnFailed(const char *msg)
-	: Error("org.freedesktop.DBus.Error.Spawn.Failed", msg)
+	ErrorSpawnFailed(const char *message)
+	: Error("org.freedesktop.DBus.Error.Spawn.Failed", message)
 	{}
 };
 
 struct DXXAPI ErrorInvalidSignature : public Error
 {
-	ErrorInvalidSignature(const char *msg)
-	: Error("org.freedesktop.DBus.Error.InvalidSignature", msg)
+	ErrorInvalidSignature(const char *message)
+	: Error("org.freedesktop.DBus.Error.InvalidSignature", message)
 	{}
 };
 
 struct DXXAPI ErrorUnixProcessIdUnknown : public Error
 {
-	ErrorUnixProcessIdUnknown(const char *msg)
-	: Error("org.freedesktop.DBus.Error.UnixProcessIdUnknown", msg)
+	ErrorUnixProcessIdUnknown(const char *message)
+	: Error("org.freedesktop.DBus.Error.UnixProcessIdUnknown", message)
 	{}
 };
 
 struct DXXAPI ErrorSELinuxSecurityContextUnknown : public Error
 {
-	ErrorSELinuxSecurityContextUnknown(const char *msg)
-	: Error("org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown", msg)
+	ErrorSELinuxSecurityContextUnknown(const char *message)
+	: Error("org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown", message)
 	{}
 };
 
diff --git a/include/dbus-c++/eventloop-integration.h b/include/dbus-c++/eventloop-integration.h
index 1bae382..8ea2b08 100644
--- a/include/dbus-c++/eventloop-integration.h
+++ b/include/dbus-c++/eventloop-integration.h
@@ -60,8 +60,17 @@ class DXXAPI BusDispatcher : public Dispatcher, public DefaultMainLoop
 {
 public:
 
+	int _pipe[2];
+
 	BusDispatcher() : _running(false)
-	{}
+	{
+		//pipe to create a new fd used to unlock a dispatcher at any
+       // moment (used by leave function)
+		pipe(_pipe);
+		_fdunlock[0] = _pipe[0];
+		_fdunlock[1] = _pipe[1];
+		
+	}
 
 	~BusDispatcher()
 	{}
diff --git a/include/dbus-c++/eventloop.h b/include/dbus-c++/eventloop.h
index f7d0f6d..fa6728b 100644
--- a/include/dbus-c++/eventloop.h
+++ b/include/dbus-c++/eventloop.h
@@ -149,6 +149,7 @@ public:
 
 	virtual void dispatch();
 
+	int _fdunlock[2];
 private:
 
 	DefaultMutex _mutex_t;
diff --git a/include/dbus-c++/interface.h b/include/dbus-c++/interface.h
index 0da848a..86c8d18 100644
--- a/include/dbus-c++/interface.h
+++ b/include/dbus-c++/interface.h
@@ -143,7 +143,7 @@ public:
 
 	void set_property(const std::string &name, Variant &value);
 
-	virtual const IntrospectedInterface * introspect() const
+	virtual IntrospectedInterface *const introspect() const
 	{
 		return NULL;
 	}
diff --git a/include/dbus-c++/introspection.h b/include/dbus-c++/introspection.h
index d12c683..5f0d1e4 100644
--- a/include/dbus-c++/introspection.h
+++ b/include/dbus-c++/introspection.h
@@ -69,7 +69,7 @@ public:
 
 protected:
 
-	const IntrospectedInterface * introspect() const;
+	IntrospectedInterface *const introspect() const;
 };
 
 class DXXAPI IntrospectableProxy : public InterfaceProxy
diff --git a/include/dbus-c++/message.h b/include/dbus-c++/message.h
index b64b101..ba326b7 100644
--- a/include/dbus-c++/message.h
+++ b/include/dbus-c++/message.h
@@ -137,7 +137,7 @@ public:
 
 private:
 
-	DXXAPILOCAL MessageIter(Message &m) : _msg(&m) {}
+	DXXAPILOCAL MessageIter(Message &msg) : _msg(&msg) {}
 
 	DXXAPILOCAL bool append_basic(int type_id, void *value);
 
diff --git a/include/dbus-c++/property.h b/include/dbus-c++/property.h
index 33f0a62..2e909cb 100644
--- a/include/dbus-c++/property.h
+++ b/include/dbus-c++/property.h
@@ -82,7 +82,7 @@ protected:
 	virtual void on_set_property(InterfaceAdaptor &/*interface*/, const std::string &/*property*/, const Variant &/*value*/)
 	{}
 
-	const IntrospectedInterface *introspect() const;
+	IntrospectedInterface *const introspect() const;
 };
 
 class DXXAPI PropertiesProxy : public InterfaceProxy
diff --git a/include/dbus-c++/server.h b/include/dbus-c++/server.h
index 25bd5ff..30879bf 100644
--- a/include/dbus-c++/server.h
+++ b/include/dbus-c++/server.h
@@ -59,7 +59,7 @@ public:
 
 protected:
 
-	Server(const Server &)
+	Server(const Server &s)
 	{}
 
 	virtual void on_new_connection(Connection &c) = 0;
diff --git a/include/dbus-c++/util.h b/include/dbus-c++/util.h
index bfec11d..225e1ca 100644
--- a/include/dbus-c++/util.h
+++ b/include/dbus-c++/util.h
@@ -55,11 +55,11 @@ public:
 		unref();
 	}
 
-	RefCnt &operator = (const RefCnt &rc)
+	RefCnt &operator = (const RefCnt &ref)
 	{
-		rc.ref();
+		ref.ref();
 		unref();
-		__ref = rc.__ref;
+		__ref = ref.__ref;
 		return *this;
 	}
 
diff --git a/src/connection.cpp b/src/connection.cpp
index b882eda..41afe9a 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -152,7 +152,7 @@ void Connection::Private::dispatch_status_stub(DBusConnection *dc, DBusDispatchS
 	}
 }
 
-DBusHandlerResult Connection::Private::message_filter_stub(DBusConnection *, DBusMessage *dmsg, void *data)
+DBusHandlerResult Connection::Private::message_filter_stub(DBusConnection *conn, DBusMessage *dmsg, void *data)
 {
 	MessageSlot *slot = static_cast<MessageSlot *>(data);
 
diff --git a/src/debug.cpp b/src/debug.cpp
index 790deb1..4f97dae 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -48,8 +48,6 @@ static void _debug_log_default(const char *format, ...)
 
 	        va_end(args);
 	}
-#else
-  (void)format;
 
 #endif//DEBUG
 }
diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp
index 354bd0d..2da4e86 100644
--- a/src/dispatcher.cpp
+++ b/src/dispatcher.cpp
@@ -86,9 +86,9 @@ bool Watch::enabled() const
 	return dbus_watch_get_enabled((DBusWatch *)_int);
 }
 
-bool Watch::handle(int flags_)
+bool Watch::handle(int flags)
 {
-	return dbus_watch_handle((DBusWatch *)_int, flags_);
+	return dbus_watch_handle((DBusWatch *)_int, flags);
 }
 
 /*
@@ -114,7 +114,7 @@ void Dispatcher::Private::on_rem_watch(DBusWatch *watch, void *data)
 	d->rem_watch(w);
 }
 
-void Dispatcher::Private::on_toggle_watch(DBusWatch *watch, void *)
+void Dispatcher::Private::on_toggle_watch(DBusWatch *watch, void *data)
 {
 	Watch *w = static_cast<Watch *>(dbus_watch_get_data(watch));
 
@@ -141,7 +141,7 @@ void Dispatcher::Private::on_rem_timeout(DBusTimeout *timeout, void *data)
 	d->rem_timeout(t);
 }
 
-void Dispatcher::Private::on_toggle_timeout(DBusTimeout *timeout, void *)
+void Dispatcher::Private::on_toggle_timeout(DBusTimeout *timeout, void *data)
 {
 	Timeout *t = static_cast<Timeout *>(dbus_timeout_get_data(timeout));
 
@@ -266,8 +266,7 @@ void DBus::_init_threading(
 		(DBusRecursiveMutexNewFunction) m1,
 		(DBusRecursiveMutexFreeFunction) m2,
 		(DBusRecursiveMutexLockFunction) m3,
-		(DBusRecursiveMutexUnlockFunction) m4,
-    0, 0, 0, 0
+		(DBusRecursiveMutexUnlockFunction) m4
 	};
 #endif//DBUS_HAS_RECURSIVE_MUTEX
 	dbus_threads_init(&functions);
diff --git a/src/error.cpp b/src/error.cpp
index 39755d7..840365b 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -46,10 +46,10 @@ Error::Error(InternalError &i)
 : _int(new InternalError(i))
 {}
 
-Error::Error(const char *n, const char *msg)
+Error::Error(const char *name, const char *message)
 : _int(new InternalError)
 {
-	set(n, msg);
+	set(name, message);
 }
 
 Error::Error(Message &m)
@@ -77,9 +77,9 @@ bool Error::is_set() const
 	return *(_int);
 }
 
-void Error::set(const char *n, const char *msg)
+void Error::set(const char *name, const char *message)
 {
-	dbus_set_error_const(&(_int->error), n, msg);
+	dbus_set_error_const(&(_int->error), name, message);
 }
 
 const char *Error::what() const throw()
diff --git a/src/eventloop-integration.cpp b/src/eventloop-integration.cpp
index ed0cc23..9e333fe 100644
--- a/src/eventloop-integration.cpp
+++ b/src/eventloop-integration.cpp
@@ -25,6 +25,8 @@
 #include <config.h>
 #endif
 
+#include <string.h>
+
 #include <dbus-c++/eventloop-integration.h>
 #include <dbus-c++/debug.h>
 
@@ -85,6 +87,9 @@ void BusDispatcher::enter()
 void BusDispatcher::leave()
 {
 	_running = false;
+	write(_fdunlock[1],"exit",strlen("exit"));
+	close(_fdunlock[1]);
+	close(_fdunlock[0]);
 }
 
 void BusDispatcher::do_iteration()
diff --git a/src/eventloop.cpp b/src/eventloop.cpp
index b112039..d64197d 100644
--- a/src/eventloop.cpp
+++ b/src/eventloop.cpp
@@ -40,13 +40,13 @@ static double millis(timeval tv)
 	return (tv.tv_sec *1000.0 + tv.tv_usec/1000.0);
 }
 	
-DefaultTimeout::DefaultTimeout(int interval_, bool repeat_, DefaultMainLoop *ed)
-: _enabled(true), _interval(interval_), _repeat(repeat_), _expiration(0), _data(0), _disp(ed)
+DefaultTimeout::DefaultTimeout(int interval, bool repeat, DefaultMainLoop *ed)
+: _enabled(true), _interval(interval), _repeat(repeat), _expiration(0), _data(0), _disp(ed)
 {
 	timeval now;
 	gettimeofday(&now, NULL);
 
-	_expiration = millis(now) + interval_;
+	_expiration = millis(now) + interval;
 
 	_disp->_mutex_t.lock();
 	_disp->_timeouts.push_back(this);
@@ -60,8 +60,8 @@ DefaultTimeout::~DefaultTimeout()
 	_disp->_mutex_t.unlock();
 }
 
-DefaultWatch::DefaultWatch(int fd, int flags_, DefaultMainLoop *ed)
-: _enabled(true), _fd(fd), _flags(flags_), _state(0), _data(0), _disp(ed)
+DefaultWatch::DefaultWatch(int fd, int flags, DefaultMainLoop *ed)
+: _enabled(true), _fd(fd), _flags(flags), _state(0), _data(0), _disp(ed)
 {
 	_disp->_mutex_w.lock();
 	_disp->_watches.push_back(this);
@@ -136,6 +136,11 @@ void DefaultMainLoop::dispatch()
 
 	int nfd = _watches.size();
 
+	if(_fdunlock)
+	{
+		nfd=nfd+2;
+	}
+
 	pollfd fds[nfd];
 
 	DefaultWatches::iterator wi = _watches.begin();
@@ -151,6 +156,18 @@ void DefaultMainLoop::dispatch()
 			++nfd;
 		}
 	}
+
+	if(_fdunlock){
+		fds[nfd].fd = _fdunlock[0];
+		fds[nfd].events = POLLIN | POLLOUT | POLLPRI ;
+		fds[nfd].revents = 0;
+		
+		nfd++;
+		fds[nfd].fd = _fdunlock[1];
+		fds[nfd].events = POLLIN | POLLOUT | POLLPRI ;
+		fds[nfd].revents = 0;
+	}
+
 	_mutex_w.unlock();
 
 	int wait_min = 10000;
diff --git a/src/glib-integration.cpp b/src/glib-integration.cpp
index ddd3c6f..491c950 100644
--- a/src/glib-integration.cpp
+++ b/src/glib-integration.cpp
@@ -31,7 +31,7 @@
 using namespace DBus;
 
 Glib::BusTimeout::BusTimeout(Timeout::Internal *ti, GMainContext *ctx, int priority)
-: Timeout(ti), _source(NULL), _ctx(ctx), _priority(priority)
+: Timeout(ti), _ctx(ctx), _priority(priority), _source(NULL)
 {
 	if (Timeout::enabled())
 		_enable();
@@ -85,7 +85,7 @@ struct BusSource
 	GPollFD poll;
 };
 
-static gboolean watch_prepare(GSource *, gint *timeout)
+static gboolean watch_prepare(GSource *source, gint *timeout)
 {
 	//debug_log("glib: watch_prepare");
 
@@ -101,7 +101,7 @@ static gboolean watch_check(GSource *source)
 	return io->poll.revents ? TRUE : FALSE;
 }
 
-static gboolean watch_dispatch(GSource *, GSourceFunc callback, gpointer data)
+static gboolean watch_dispatch(GSource *source, GSourceFunc callback, gpointer data)
 {
 	debug_log("glib: watch_dispatch");
 
@@ -113,13 +113,11 @@ static GSourceFuncs watch_funcs = {
 	watch_prepare,
 	watch_check,
 	watch_dispatch,
-	NULL,
-  NULL,
-  NULL
+	NULL
 };
 
 Glib::BusWatch::BusWatch(Watch::Internal *wi, GMainContext *ctx, int priority)
-: Watch(wi), _source(NULL), _ctx(ctx), _priority(priority)
+: Watch(wi), _ctx(ctx), _priority(priority), _source(NULL)
 {
 	if (Watch::enabled())
 		_enable();
@@ -167,16 +165,16 @@ void Glib::BusWatch::_enable()
 	g_source_set_priority(_source, _priority);
 	g_source_set_callback(_source, watch_handler, this, NULL);
 
-	int flags_ = Watch::flags();
+	int flags = Watch::flags();
 	int condition = 0;
 
-	if (flags_ &DBUS_WATCH_READABLE)
+	if (flags &DBUS_WATCH_READABLE)
 		condition |= G_IO_IN;
-	if (flags_ &DBUS_WATCH_WRITABLE)
+	if (flags &DBUS_WATCH_WRITABLE)
 		condition |= G_IO_OUT;
-	if (flags_ &DBUS_WATCH_ERROR)
+	if (flags &DBUS_WATCH_ERROR)
 		condition |= G_IO_ERR;
-	if (flags_ &DBUS_WATCH_HANGUP)
+	if (flags &DBUS_WATCH_HANGUP)
 		condition |= G_IO_HUP;
 
 	GPollFD *poll = &(((BusSource *)_source)->poll);
@@ -219,15 +217,15 @@ static gboolean dispatcher_prepare(GSource *source, gint *timeout)
   	return dispatcher->has_something_to_dispatch()? TRUE:FALSE;
 }
 
-static gboolean dispatcher_check(GSource *)
+static gboolean dispatcher_check(GSource *source)
 {
   	return FALSE;
 }
 
 static gboolean
 dispatcher_dispatch(GSource *source,
-                    GSourceFunc,
-                    gpointer)
+                    GSourceFunc callback,
+                    gpointer user_data)
 {
   	Dispatcher *dispatcher = ((DispatcherSource*)source)->dispatcher;
 
@@ -239,9 +237,7 @@ static const GSourceFuncs dispatcher_funcs = {
 	dispatcher_prepare,
 	dispatcher_check,
 	dispatcher_dispatch,
-	NULL,
-  NULL,
-  NULL
+	NULL
 };
 
 Glib::BusDispatcher::BusDispatcher()
diff --git a/src/interface.cpp b/src/interface.cpp
index 8cf27a9..b0360ac 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -32,40 +32,40 @@
 
 using namespace DBus;
 
-Interface::Interface(const std::string &n)
-: _name(n)
+Interface::Interface(const std::string &name)
+: _name(name)
 {}
 
 Interface::~Interface()
 {}
 
-InterfaceAdaptor *AdaptorBase::find_interface(const std::string &n)
+InterfaceAdaptor *AdaptorBase::find_interface(const std::string &name)
 {
-	InterfaceAdaptorTable::const_iterator ii = _interfaces.find(n);
+	InterfaceAdaptorTable::const_iterator ii = _interfaces.find(name);
 
 	return ii != _interfaces.end() ? ii->second : NULL;
 }
 
-InterfaceAdaptor::InterfaceAdaptor(const std::string &n)
-: Interface(n)
+InterfaceAdaptor::InterfaceAdaptor(const std::string &name)
+: Interface(name)
 {
-	debug_log("adding interface %s", n.c_str());
+	debug_log("adding interface %s", name.c_str());
 
-	_interfaces[n] = this;
+	_interfaces[name] = this;
 }
 
 Message InterfaceAdaptor::dispatch_method(const CallMessage &msg)
 {
-	const char *n = msg.member();
+	const char *name = msg.member();
 
-	MethodTable::iterator mi = _methods.find(n);
+	MethodTable::iterator mi = _methods.find(name);
 	if (mi != _methods.end())
 	{
 		return mi->second.call(msg);
 	}
 	else
 	{
-		return ErrorMessage(msg, DBUS_ERROR_UNKNOWN_METHOD, n);
+		return ErrorMessage(msg, DBUS_ERROR_UNKNOWN_METHOD, name);
 	}
 }
 
@@ -79,9 +79,9 @@ void InterfaceAdaptor::emit_signal(const SignalMessage &sig)
 	_emit_signal(sig2);
 }
 
-Variant *InterfaceAdaptor::get_property(const std::string &n)
+Variant *InterfaceAdaptor::get_property(const std::string &name)
 {
-	PropertyTable::iterator pti = _properties.find(n);
+	PropertyTable::iterator pti = _properties.find(name);
 
 	if (pti != _properties.end())
 	{
@@ -93,9 +93,9 @@ Variant *InterfaceAdaptor::get_property(const std::string &n)
 	return NULL;
 }
 
-void InterfaceAdaptor::set_property(const std::string &n, Variant &value)
+void InterfaceAdaptor::set_property(const std::string &name, Variant &value)
 {
-	PropertyTable::iterator pti = _properties.find(n);
+	PropertyTable::iterator pti = _properties.find(name);
 
 	if (pti != _properties.end())
 	{
@@ -113,26 +113,26 @@ void InterfaceAdaptor::set_property(const std::string &n, Variant &value)
 	throw ErrorFailed("requested property not found");
 }
 
-InterfaceProxy *ProxyBase::find_interface(const std::string &n)
+InterfaceProxy *ProxyBase::find_interface(const std::string &name)
 {
-	InterfaceProxyTable::const_iterator ii = _interfaces.find(n);
+	InterfaceProxyTable::const_iterator ii = _interfaces.find(name);
 
 	return ii != _interfaces.end() ? ii->second : NULL;
 }
 
-InterfaceProxy::InterfaceProxy(const std::string &n)
-: Interface(n)
+InterfaceProxy::InterfaceProxy(const std::string &name)
+: Interface(name)
 {
-	debug_log("adding interface %s", n.c_str());
+	debug_log("adding interface %s", name.c_str());
 
-	_interfaces[n] = this;
+	_interfaces[name] = this;
 }
 
 bool InterfaceProxy::dispatch_signal(const SignalMessage &msg)
 {
-	const char *n = msg.member();
+	const char *name = msg.member();
 
-	SignalTable::iterator si = _signals.find(n);
+	SignalTable::iterator si = _signals.find(name);
 	if (si != _signals.end())
 	{
 		si->second.call(msg);
diff --git a/src/introspection.cpp b/src/introspection.cpp
index 1e5b806..11fa883 100644
--- a/src/introspection.cpp
+++ b/src/introspection.cpp
@@ -61,7 +61,7 @@ Message IntrospectableAdaptor::Introspect(const CallMessage &call)
 	{
 		debug_log("introspecting interface %s", iti->first.c_str());
 
-		const IntrospectedInterface * intro = iti->second->introspect();
+		IntrospectedInterface *const intro = iti->second->introspect();
 		if (intro)
 		{
 			xml << "\n\t<interface name=\"" << intro->name << "\">";
@@ -144,7 +144,7 @@ Message IntrospectableAdaptor::Introspect(const CallMessage &call)
 	return reply;
 }
 
-const IntrospectedInterface * IntrospectableAdaptor::introspect() const
+IntrospectedInterface *const IntrospectableAdaptor::introspect() const
 {
 	static IntrospectedArgument Introspect_args[] =
 	{
diff --git a/src/message.cpp b/src/message.cpp
index 651b5c1..aa920b3 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -236,9 +236,9 @@ char *MessageIter::signature() const
 	return dbus_message_iter_get_signature((DBusMessageIter *)&_iter);
 }
 
-bool MessageIter::append_array(char type_, const void *ptr, size_t length)
+bool MessageIter::append_array(char type, const void *ptr, size_t length)
 {
-	return dbus_message_iter_append_fixed_array((DBusMessageIter *)&_iter, type_, &ptr, length);
+	return dbus_message_iter_append_fixed_array((DBusMessageIter *)&_iter, type, &ptr, length);
 }
 
 int MessageIter::array_type()
@@ -491,9 +491,9 @@ ErrorMessage::ErrorMessage()
 	_pvt->msg = dbus_message_new(DBUS_MESSAGE_TYPE_ERROR);
 }
 
-ErrorMessage::ErrorMessage(const Message &to_reply, const char *name_, const char *message)
+ErrorMessage::ErrorMessage(const Message &to_reply, const char *name, const char *message)
 {
-	_pvt->msg = dbus_message_new_error(to_reply._pvt->msg, name_, message);
+	_pvt->msg = dbus_message_new_error(to_reply._pvt->msg, name, message);
 }
 
 bool ErrorMessage::operator == (const ErrorMessage &m) const
@@ -520,9 +520,9 @@ SignalMessage::SignalMessage(const char *name)
 	member(name);
 }
 
-SignalMessage::SignalMessage(const char *path_, const char *interface_, const char *name)
+SignalMessage::SignalMessage(const char *path, const char *interface, const char *name)
 {
-	_pvt->msg = dbus_message_new_signal(path_, interface_, name);
+	_pvt->msg = dbus_message_new_signal(path, interface, name);
 }
 
 bool SignalMessage::operator == (const SignalMessage &m) const
@@ -575,9 +575,9 @@ CallMessage::CallMessage()
 	_pvt->msg = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_CALL);
 }
 
-CallMessage::CallMessage(const char *dest, const char *path_, const char *iface, const char *method)
+CallMessage::CallMessage(const char *dest, const char *path, const char *iface, const char *method)
 {
-	_pvt->msg = dbus_message_new_method_call(dest, path_, iface, method);
+	_pvt->msg = dbus_message_new_method_call(dest, path, iface, method);
 }
 
 bool CallMessage::operator == (const CallMessage &m) const
diff --git a/src/object.cpp b/src/object.cpp
index 53f3714..f7d0916 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -39,8 +39,8 @@
 
 using namespace DBus;
 
-Object::Object(Connection &conn_, const Path &path_, const char *service_)
-: _conn(conn_), _path(path_), _service(service_ ? service_ : "")
+Object::Object(Connection &conn, const Path &path, const char *service)
+: _conn(conn), _path(path), _service(service ? service : "")
 {
 }
 
@@ -61,7 +61,7 @@ static DBusObjectPathVTable _vtable =
 	NULL, NULL, NULL, NULL
 };
 
-void ObjectAdaptor::Private::unregister_function_stub(DBusConnection *, void *)
+void ObjectAdaptor::Private::unregister_function_stub(DBusConnection *conn, void *data)
 {
  	//TODO: what do we have to do here ?
 }
@@ -148,8 +148,8 @@ ObjectPathList ObjectAdaptor::child_nodes_from_prefix(const std::string &prefix)
 	return ali;
 }
 
-ObjectAdaptor::ObjectAdaptor(Connection &conn_, const Path &path_)
-: Object(conn_, path_, conn_.unique_name())
+ObjectAdaptor::ObjectAdaptor(Connection &conn, const Path &path)
+: Object(conn, path, conn.unique_name())
 {
 	register_obj();
 }
@@ -270,8 +270,8 @@ ObjectAdaptor::Continuation *ObjectAdaptor::find_continuation(const Tag *tag)
 	return di != _continuations.end() ? di->second : NULL;
 }
 
-ObjectAdaptor::Continuation::Continuation(Connection &conn, const CallMessage &call, const Tag *tag_)
-: _conn(conn), _call(call), _return(_call), _tag(tag_)
+ObjectAdaptor::Continuation::Continuation(Connection &conn, const CallMessage &call, const Tag *tag)
+: _conn(conn), _call(call), _return(_call), _tag(tag)
 {
 	_writer = _return.writer(); //todo: verify
 }
@@ -279,8 +279,8 @@ ObjectAdaptor::Continuation::Continuation(Connection &conn, const CallMessage &c
 /*
 */
 
-ObjectProxy::ObjectProxy(Connection &conn_, const Path &path_, const char *service_)
-: Object(conn_, path_, service_)
+ObjectProxy::ObjectProxy(Connection &conn, const Path &path, const char *service)
+: Object(conn, path, service)
 {
 	register_obj();
 }
diff --git a/src/pendingcall.cpp b/src/pendingcall.cpp
index fbc7542..3757d8f 100644
--- a/src/pendingcall.cpp
+++ b/src/pendingcall.cpp
@@ -52,7 +52,7 @@ PendingCall::Private::~Private()
 	}
 }
 
-void PendingCall::Private::notify_stub(DBusPendingCall *, void *data)
+void PendingCall::Private::notify_stub(DBusPendingCall *dpc, void *data)
 {
 	PendingCall::Private *pvt = static_cast<PendingCall::Private *>(data);
 
diff --git a/src/property.cpp b/src/property.cpp
index f4db402..15a2f5b 100644
--- a/src/property.cpp
+++ b/src/property.cpp
@@ -96,7 +96,7 @@ Message PropertiesAdaptor::Set(const CallMessage &call)
 	return reply;
 }
 
-const IntrospectedInterface *PropertiesAdaptor::introspect() const
+IntrospectedInterface *const PropertiesAdaptor::introspect() const
 {
 	static IntrospectedArgument Get_args[] =
 	{
@@ -141,14 +141,14 @@ PropertiesProxy::PropertiesProxy()
 {
 }
 
-Variant PropertiesProxy::Get(const std::string &/*iface*/, const std::string &/*property*/)
+Variant PropertiesProxy::Get(const std::string &iface, const std::string &property)
 {
 //todo
 	Variant v;
 	return v;
 }
 
-void PropertiesProxy::Set(const std::string &/*iface*/, const std::string &/*property*/, const Variant &/*value*/)
+void PropertiesProxy::Set(const std::string &iface, const std::string &property, const Variant &value)
 {
 //todo
 }
diff --git a/src/server.cpp b/src/server.cpp
index 423d576..0c652e5 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -44,7 +44,7 @@ Server::Private::~Private()
 {
 }
 
-void Server::Private::on_new_conn_cb(DBusServer *, DBusConnection *conn, void *data)
+void Server::Private::on_new_conn_cb(DBusServer *server, DBusConnection *conn, void *data)
 {
 	Server *s = static_cast<Server *>(data);
 
diff --git a/src/types.cpp b/src/types.cpp
index 0ca60ca..117cca3 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -68,11 +68,11 @@ const Signature Variant::signature() const
 {
 	char *sigbuf = reader().signature();
 
-	Signature sig = sigbuf;
+	Signature signature = sigbuf;
 
 	free(sigbuf);
 
-	return sig;
+	return signature;
 }
 
 MessageIter &operator << (MessageIter &iter, const Variant &val)
diff --git a/tools/generate_adaptor.cpp b/tools/generate_adaptor.cpp
index 38975c9..891ecfc 100644
--- a/tools/generate_adaptor.cpp
+++ b/tools/generate_adaptor.cpp
@@ -145,7 +145,7 @@ void generate_adaptor(Xml::Document &doc, const char *filename)
 		body << tab << "}" << endl
 		     << endl;
 
-		body << tab << "const ::DBus::IntrospectedInterface *introspect() const " << endl
+		body << tab << "::DBus::IntrospectedInterface *const introspect() const " << endl
 		     << tab << "{" << endl;
 
 		// generate the introspect arguments
diff --git a/tools/xml2cpp.cpp b/tools/xml2cpp.cpp
index 81cd18e..32481d8 100644
--- a/tools/xml2cpp.cpp
+++ b/tools/xml2cpp.cpp
@@ -1,6 +1,6 @@
 /*
  *
- *  D-->Bus++ - C++ bindings for D-Bus
+ *  D-Bus++ - C++ bindings for D-Bus
  *
  *  Copyright (C) 2005-2007  Paolo Durante <shackan@gmail.com>
  *
@@ -30,7 +30,6 @@
 #include <iostream>
 #include <fstream>
 #include <sstream>
-#include <algorithm>
 
 #include "xml2cpp.h"
 #include "generate_adaptor.h"
@@ -54,13 +53,16 @@ void usage(const char *argv0)
 		return t;
 
 	return DBUS_TYPE_INVALID;
-}
+}*/
 
-bool is_atomic_type(const string &type)
+
+
+/*bool is_atomic_type(const string &type)
 {
 	return type.length() == 1 && char_to_atomic_type(type[0]) != DBUS_TYPE_INVALID;
 }*/
 
+
 int main(int argc, char ** argv)
 {
 	if (argc < 2)