diff --git a/src/dbus/callmanager.cpp b/src/dbus/callmanager.cpp
index ac63ed0a40ca7a0b7ad06c4e55a7a754d893dd79..31929f2983df4d2e8af68239fd678c0e4f63e143 100644
--- a/src/dbus/callmanager.cpp
+++ b/src/dbus/callmanager.cpp
@@ -113,8 +113,8 @@ CallManager::getVolume( const std::string& device )
     return 0;
 }
 
-std::map< ::DBus::String, ::DBus::String > 
-CallManager::getCallDetails( const ::DBus::String& callID UNUSED )
+std::map< std::string, std::string > 
+CallManager::getCallDetails( const std::string& callID UNUSED )
 {
     _debug("CallManager::getCallDetails received\n");
     std::map<std::string, std::string> a;
diff --git a/src/dbus/configurationmanager.cpp b/src/dbus/configurationmanager.cpp
index 9cdda1bda6754a1b38f9f0cd9a3cec7dd95a68f3..753bab7f31f69f3ea31173242fd0cd4f9188e248 100644
--- a/src/dbus/configurationmanager.cpp
+++ b/src/dbus/configurationmanager.cpp
@@ -80,7 +80,7 @@ ConfigurationManager::getAccountList(  )
 std::vector< std::string > 
 ConfigurationManager::getToneLocaleList(  )
 {
-        std::vector< ::DBus::String > ret;
+        std::vector< std::string > ret;
 	_debug("ConfigurationManager::getToneLocaleList received\n");
         return ret;
 }
@@ -90,7 +90,7 @@ ConfigurationManager::getToneLocaleList(  )
 	std::string 
 ConfigurationManager::getVersion(  )
 {
-	::DBus::String ret("");
+        std::string ret("");
 	_debug("ConfigurationManager::getVersion received\n");
         return ret;
 
@@ -100,7 +100,7 @@ ConfigurationManager::getVersion(  )
 	std::vector< std::string > 
 ConfigurationManager::getRingtoneList(  )
 {
-	std::vector< ::DBus::String >  ret;
+	std::vector< std::string >  ret;
 	_debug("ConfigurationManager::getRingtoneList received\n");
         return ret;
 }
@@ -212,7 +212,7 @@ ConfigurationManager::getCurrentAudioOutputPlugin( void )
 	std::vector< std::string > 
 ConfigurationManager::getPlaybackDeviceList(  )
 {
-	std::vector< ::DBus::String >  ret;
+	std::vector< std::string >  ret;
 	_debug("ConfigurationManager::getPlaybackDeviceList received\n");
         return ret;
 }
@@ -220,7 +220,7 @@ ConfigurationManager::getPlaybackDeviceList(  )
 	std::vector< std::string > 
 ConfigurationManager::getRecordDeviceList(  )
 {
-	std::vector< ::DBus::String >  ret;
+	std::vector< std::string >  ret;
 	_debug("ConfigurationManager::getRecordDeviceList received\n");
         return ret;
 
diff --git a/src/dbus/contactmanager.cpp b/src/dbus/contactmanager.cpp
index 2a376470c1e465d8a28c5fc0a41b1bc3798fe8aa..885585c40ec05bfdf682b9263a78abf9b9222032 100644
--- a/src/dbus/contactmanager.cpp
+++ b/src/dbus/contactmanager.cpp
@@ -22,28 +22,28 @@
 
 const char* ContactManager::SERVER_PATH = "/org/sflphone/SFLphone/ContactManager";
 
-std::map< ::DBus::String, ::DBus::String >
-ContactManager::getContacts( const ::DBus::String& accountID UNUSED)
+std::map< std::string, std::string >
+ContactManager::getContacts( const std::string& accountID UNUSED)
 {
         // TODO
-    std::map< ::DBus::String, ::DBus::String > ret;
+    std::map< std::string, std::string > ret;
     return ret;
 }
 
 void
-ContactManager::setContacts( const ::DBus::String& accountID UNUSED, const std::map< ::DBus::String UNUSED, ::DBus::String >& details UNUSED)
+ContactManager::setContacts( const std::string& accountID UNUSED, const std::map< std::string UNUSED, std::string >& details UNUSED)
 {
 	// TODO
 }
 
 void
-ContactManager::setPresence( const ::DBus::String& accountID UNUSED, const ::DBus::String& presence UNUSED, const ::DBus::String& additionalInfo UNUSED)
+ContactManager::setPresence( const std::string& accountID UNUSED, const std::string& presence UNUSED, const std::string& additionalInfo UNUSED)
 {
 	// TODO
 }
 
 void
-ContactManager::setContactPresence( const ::DBus::String& accountID UNUSED, const ::DBus::String& presence UNUSED, const ::DBus::String& additionalInfo UNUSED)
+ContactManager::setContactPresence( const std::string& accountID UNUSED, const std::string& presence UNUSED, const std::string& additionalInfo UNUSED)
 {
 	// TODO
 }
diff --git a/src/dbus/instance.cpp b/src/dbus/instance.cpp
index 33c4ad1622bf67a78c4a5e6e86be6970812ec351..0b4ace62a55e9d70271f5a0505cce61dacb19087 100644
--- a/src/dbus/instance.cpp
+++ b/src/dbus/instance.cpp
@@ -29,8 +29,8 @@ Instance::Instance( DBus::Connection& connection )
 }
 
 void
-Instance::Register( const ::DBus::Int32& pid UNUSED, 
-                     const ::DBus::String& name UNUSED)
+Instance::Register( const int32_t& pid UNUSED, 
+                     const std::string& name UNUSED)
 {
     _debug("Instance::register received\n");
     count++;
@@ -38,7 +38,7 @@ Instance::Register( const ::DBus::Int32& pid UNUSED,
 
 
 void
-Instance::Unregister( const ::DBus::Int32& pid UNUSED)
+Instance::Unregister( const int32_t& pid UNUSED)
 {
     _debug("Instance::unregister received\n");
     count --;